Fixed Nabi Issues
authorManoj Das <m.das@samsung.com>
Fri, 29 Mar 2013 00:34:17 +0000 (06:04 +0530)
committerManoj Das <m.das@samsung.com>
Fri, 29 Mar 2013 00:34:17 +0000 (06:04 +0530)
Change-Id: I08784cbe0a693cba4842cf66de1a0091fabe8d57

27 files changed:
inc/IntBookmarkData.h
inc/IntBookmarkPresentationModel.h
inc/IntHistoryData.h
inc/IntHistoryPresentationModel.h
inc/IntIAddressbarEventListener.h
inc/IntMainForm.h
inc/IntPresentationModelBase.h
res/screen-size-normal/IDL_ADDRESSBAR.xml
res/screen-size-normal/IDL_ADD_BOOKMARK.xml
res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
res/screen-size-normal/IDL_FIND_ON_PAGE.xml
res/screen-size-normal/IDL_FORM.xml
res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml
src/IntAddBookmarkForm.cpp
src/IntAddressbar.cpp
src/IntBookmarkData.cpp
src/IntBookmarkListForm.cpp
src/IntBookmarkPresentationModel.cpp
src/IntBrightnessForm.cpp
src/IntEditBookmarkListForm.cpp
src/IntEditHistoryListForm.cpp
src/IntHistory.cpp
src/IntHistoryListForm.cpp
src/IntHistoryPresentationModel.cpp
src/IntMainForm.cpp
src/IntNotificationPanel.cpp
src/IntPresentationModelBase.cpp

index 81d18ec..054b3ac 100644 (file)
@@ -26,7 +26,7 @@
 
 
 #include <FBase.h>
-
+#include <FUi.h>
 /**
  * @enum BookmarkType
  *
@@ -207,6 +207,21 @@ public:
         */
        void SetUrl(const Tizen::Base::String& strUrl);
 
+       void SetFavIconBitmap(Tizen::Graphics::Bitmap& favIconImage);
+
+       void SetFavIconBuffer(Tizen::Base::ByteBuffer& favIconBuffer);
+
+       Tizen::Base::ByteBuffer* GetFavIconBuffer();
+
+       Tizen::Graphics::Bitmap* GetFavIconBitmap();
+
+       int GetFavIconWidth();
+
+       int GetFavIconHeight();
+
+       void SetFavIconWidth(int favIconWidth);
+
+       void SetFavIconHeight(int favIconHeight);
 private:
        Tizen::Base::String     __bookmarkId;
        type    __bookmarkType;
@@ -217,6 +232,9 @@ private:
        Tizen::Base::String     __iconPath;
        Tizen::Base::DateTime __modifiedTime;
        Tizen::Base::String     __parentId;
+       Tizen::Base::ByteBuffer* __pFavIconData;
+       int __favIconWidth;
+       int __favIconHeight;
 };
 
 #endif //_INT_BOOKMARK_DATA_H_
index f7b4228..9481338 100644 (file)
@@ -264,6 +264,7 @@ public:
         */
        result SaveBookmark(BookmarkData& bookmark);
 
+       result SaveTempBookmark(BookmarkData& bookmark);
 private:
        /**
         * @brief The Default Constructor
index 32f3e28..62cf6a3 100644 (file)
@@ -207,7 +207,6 @@ public:
         */
        void SetVisitedTime(const Tizen::Base::DateTime& strVisitedTime);
 
-
        /**
         * This function sets visited count of a URL
         *
@@ -216,6 +215,22 @@ public:
         */
        void SetVisitedCount(int& visitedCount);
 
+       void SetFavIconBitmap(Tizen::Graphics::Bitmap& favIconImage);
+
+       void SetFavIconBuffer(Tizen::Base::ByteBuffer& favIconBuffer);
+
+       Tizen::Base::ByteBuffer* GetFavIconBuffer();
+
+       Tizen::Graphics::Bitmap* GetFavIconBitmap();
+
+       int GetFavIconWidth();
+
+       int GetFavIconHeight();
+
+       void SetFavIconWidth(int favIconWidth);
+
+       void SetFavIconHeight(int favIconHeight);
+
 private:
        Tizen::Base::String __bookmarkId;
        Tizen::Base::String     __faviconId;
@@ -227,6 +242,9 @@ private:
        Tizen::Graphics::Bitmap* __pThumbnail;
        int __visitedCount;
        Tizen::Base::DateTime __visitedTime;
+       Tizen::Base::ByteBuffer* __pFavIconData;
+       int __favIconWidth;
+       int __favIconHeight;
 };
 
 #endif //_INT_HISTORY_DATA_H_
index bd8a4bd..dff81e4 100644 (file)
@@ -130,6 +130,8 @@ public:
         */
        result SaveHistory(History& history);
 
+       result SaveTempHistory(History& history);
+
        /**
         * This function selects the history from the table
         *
@@ -255,6 +257,8 @@ private:
        Tizen::Base::String GetStringFromDate(Tizen::Base::DateTime& date);
 
        static HistoryPresentationModel* __pHistoryPresentationModel;
+
+       Tizen::Base::Collection::ArrayList *__pDataList;
 };
 
 #endif //_INT_HISTORY_PRESENTATION_MODEL_H
index 8d2a79e..46d31a7 100644 (file)
@@ -39,7 +39,7 @@ class IAddressbarEventListener
 {
 public:
        virtual ~IAddressbarEventListener(void) {};
-       virtual void OnAddressBarKeypadClosed(const Addressbar&) = 0;
+       virtual void OnAddressBarKeypadClosed(const Addressbar&, bool footerState = true ) = 0;
        virtual void OnAddressBarKeypadOpened(const Addressbar&) = 0;
        virtual void OnAddressBarKeypadWillOpen(const Addressbar&) = 0;
        //virtual void OnAddressBarModeChanged(const Addressbar&) = 0;
index ad52e72..aaf2789 100644 (file)
@@ -102,7 +102,7 @@ public:
        //IAddressbarEventListener
        void OnAddressCancelledClicked(const Addressbar&);
 
-       void OnAddressBarKeypadClosed(const Addressbar&);
+       void OnAddressBarKeypadClosed(const Addressbar&, bool footerState = true);
 
        void OnAddressBarKeypadOpened(const Addressbar&);
 
@@ -126,6 +126,7 @@ public:
 
        //ILoadingeventListener
        virtual void OnEstimatedProgress(int progress);
+       virtual void OnFaviconReceived(const Tizen::Graphics::Bitmap& favicon);
 
        virtual bool OnHttpAuthenticationRequestedN(const Tizen::Base::String& host, const Tizen::Base::String& realm, const Tizen::Web::Controls::AuthenticationChallenge& authentication);
 
@@ -135,9 +136,9 @@ public:
 
        virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
 
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source){}
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
 
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);;
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
 
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction){}
 
@@ -326,6 +327,7 @@ private:
        Tizen::Graphics::Point __webControlPosition;
 
        Tizen::Ui::Controls::ListContextItem* __pItemContext;
+       Tizen::Ui::Controls::ListContextItem* __pItemContextLandscape;
        Tizen::Base::Collection::ArrayList* __pMostVisitedSites;
        Tizen::Ui::Controls::EditField* __pFooterUrlField;
        Tizen::Ui::Controls::Button* __pGoBackBtn;
@@ -335,6 +337,7 @@ private:
        Tizen::Ui::Controls::Label* __pFooterLabel;
        Tizen::Ui::Controls::Button* __pStopBtn;
        Tizen::Ui::Controls::Button* __pClearBtn;
+
 };
 
 #endif  //_INT_MAIN_FORM_H_
index 08a2252..77a0bff 100644 (file)
@@ -29,6 +29,8 @@
 #include <FIo.h>
 
 #include "IntTypes.h"
+#include "IntBookmarkData.h"
+#include "IntHistoryData.h"
 
 /**
  * @class      PresentationModelBase
@@ -103,6 +105,18 @@ public:
         */
         result ExecuteQuery(const Tizen::Base::String& pszFormatQuery, int& nRowCount);
 
+        /**
+         * This function drops the existing tables from database
+         *
+         * @return      An error code
+         * @param              No parameter
+         * @exception  E_SUCCESS               The table is dropped successfully from database
+         * @exception  E_FAILURE               The table drop is unsuccessful
+         */
+        result ExecuteBookmarkQuery(const Tizen::Base::String& pszFormatQuery, int& nRowCount, BookmarkData& bookmark);
+
+        result ExecuteHistoryQuery(const Tizen::Base::String& pszFormatQuery, int& nRowCount, History& history);
+
         result GetColumn(int nIndex, Tizen::Base::String& strVal);
 
         result GetColumn(int nIndex, int& nIntVal);
@@ -111,6 +125,8 @@ public:
 
         result GetColumn(int nIndex, Tizen::Base::DateTime& dtVal);
 
+        result GetColumn(int nIndex,Tizen::Base::ByteBuffer& favIconBuffer);
+
        static bool GetCurrentDateTime(Tizen::Base::DateTime& dt);
 
        /**
index 9269724..6b299af 100644 (file)
@@ -3,60 +3,60 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201303182057" Dversion="20120315">
     <Panel id="IDL_ADDRESSBAR">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout height="94" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>
-        <layout height="94" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>
+        <layout height="94.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>
+        <layout height="94.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="0.0"/>
     </Panel>
     <Label id="IDC_BG_LABEL" parent="IDL_ADDRESSBAR">
-        <property backgroundBitmapPath="I01_toolbar_bg_01.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_ADDRESSBAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_01.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_ADDRESSBAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Panel id="IDC_BG_PANEL" parent="IDL_ADDRESSBAR">
         <property backgroundColor="#FFFFFF" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="10" marginRight="10" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="623" x="18" y="3"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="32" y="3"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="10.0" marginRight="10.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="623.0" x="18.0" y="3.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1132.0" x="32.0" y="3.0"/>
     </Panel>
     <Label id="IDC_ADDRESSBAR_BG_LABEL" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="EditBackground.png" backgroundColor="#FFFFFF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="623" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="EditBackground.png" backgroundColor="#FFFFFF" 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="72.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="623.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.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="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132.0" x="0" y="0.0"/>
     </Label>
     <Button id="IDC_STOP_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#000000" pressedBGBitmapPath="" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="551" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1058" y="0"/>
+        <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="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#000000" pressedBGBitmapPath="" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="551.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="1058.0" y="0.0"/>
     </Button>
     <EditField id="IDC_URL_EDITFIELD" parent="IDC_BG_PANEL">
-        <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="::IDS_BR_BODY_SEARCH_OR_ENTER_URL" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#4E4945" horizontalMargin="0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="18" viewMode="false"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="527" x="96" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="128" y="1"/>
+        <property accessibilityHint="" commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="::IDS_BR_BODY_SEARCH_OR_ENTER_URL" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#4E4945" horizontalMargin="0.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="18.0" viewMode="false"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="527.0" x="96.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132.0" x="128.0" y="1.0"/>
     </EditField>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="551" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1058" y="0"/>
+        <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="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="551.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="1058.0" y="0.0"/>
     </Button>
     <Label id="IDC_TOOLBAR_LABEL" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="I01_URL_toolbar_button.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="96" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="96" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="I01_URL_toolbar_button.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.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="96.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.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="96.0" x="0.0" y="0.0"/>
     </Label>
     <Label id="IDC_URL_LABEL" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="I01_URL_bookmark_icon.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="50" x="22" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="34" x="22" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="I01_URL_bookmark_icon.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.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="50.0" x="22.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50.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="50.0" x="22.0" y="12.0"/>
     </Label>
     <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDL_ADDRESSBAR">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="82"/>
-        <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="82"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="82.0"/>
+        <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="82.0"/>
     </Label>
     <Button id="IDC_ADDRESS_BACK_BUTTON" parent="IDL_ADDRESSBAR">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_icon_Back.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_icon_Back_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="651" y="3"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="1211" y="0"/>
+        <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="" 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="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="651.0" y="3.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.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="48.0" x="1211.0" y="0.0"/>
     </Button>
 </ScenePanel>
index c66046f..c31a6a6 100644 (file)
@@ -19,7 +19,7 @@
         </itemSet>
     </Header>
     <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">
-        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="false" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
+        <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" mode="Portrait" width="720"/>
         <panelLayout height="563" mode="Landscape" width="1280"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1109" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>
     <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" fastScroll="false" itemDivider="true" itemDividerColor="#8E9AA3" sweepEnabled="false" textOfEmptyList=""/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="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" x="0" y="259"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="260" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238" x="26" y="293"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="260" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1248" x="16" y="293"/>
     </ListView>
     <EditField id="IDC_EDITFIELD2" parent="IDC_SCROLLPANEL2">
         <property commandButtonVisible="true" 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" 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" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="12" marginRight="16" marginTop="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" x="12" y="182"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238" x="26" y="196"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="12" marginRight="16" marginTop="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" x="0" y="182"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="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="1238" x="26" y="196"/>
     </EditField>
     <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
         <property backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_BOTTOM"/>
@@ -52,8 +52,8 @@
     </Label>
     <EditField id="IDC_EDITFIELD1" parent="IDC_SCROLLPANEL2">
         <property commandButtonVisible="true" 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" 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" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="12" marginRight="16" marginTop="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" x="12" y="62"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238" x="26" y="68"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="12" marginRight="16" marginTop="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" x="0" y="62"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="16" marginTop="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="1238" x="26" y="68"/>
     </EditField>
     <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
         <property backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_BOTTOM"/>
index 0be5207..32b44e4 100644 (file)
     </Label>
     <EditField id="IDC_EDITFIELD_FOLDER_TITLE" parent="IDL_CREATE_BOOKMARK_FOLDER">
         <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="#FFFFFF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="#FFFFFF" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="48"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="48"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CREATE_BOOKMARK_FOLDER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="48"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CREATE_BOOKMARK_FOLDER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="48"/>
     </EditField>
     <Label id="IDC_LABEL2" parent="IDL_CREATE_BOOKMARK_FOLDER">
         <property backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CREATE_BOOKMARK_FOLDER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
     </Label>
 </Scene>
index ae494d5..41150e8 100644 (file)
@@ -4,29 +4,29 @@
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 
-<ScenePanel Bversion="3.0.0.201302121633" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">
     <Panel id="IDL_FIND_ON_PAGE">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="82" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="3" y="27"/>
         <layout height="82" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="3" y="142"/>
     </Panel>
     <Label id="IDC_LABEL3" parent="IDL_FIND_ON_PAGE">
-        <property backgroundBitmapPath="I01_toolbar_bg_01.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="0" x="0" y="0"/>
     </Label>
     <Button id="IDC_FIND_CANCEL" parent="IDL_FIND_ON_PAGE">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_BR_SK_CANCEL" textSize="28" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_BR_SK_CANCEL" textSize="28" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Portrait" rightRelation="IDL_FIND_ON_PAGE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="127" x="577" y="5"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="16" marginTop="0" mode="Landscape" rightRelation="IDL_FIND_ON_PAGE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="134" x="1130" y="5"/>
     </Button>
     <Button id="IDC_FIND_PREV" parent="IDL_FIND_ON_PAGE">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="I01_title_btn_icon_up_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_up.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_up.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_title_btn_icon_up_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_up.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_up.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="16" y="5"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FIND_ON_PAGE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="16" y="5"/>
     </Button>
     <Button id="IDC_FIND_NEXT" parent="IDL_FIND_ON_PAGE">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="I01_title_btn_icon_down_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_down.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_down.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_title_btn_icon_down_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_down.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_down.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="3" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="97" y="5"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FIND_PREV" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="3" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="97" y="5"/>
     </Button>
@@ -41,7 +41,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="923" x="0" y="0"/>
     </Label>
     <Button id="IDC_FIND_CLEAR" parent="IDC_PANEL1">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#4D4D4D" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#4D4D4D" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL1" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="298" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_PANEL1" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="851" y="0"/>
     </Button>
@@ -52,7 +52,7 @@
     </Label>
     <EditField id="IDC_FIND_WORD_EDITFIELD" parent="IDC_PANEL1">
         <property commandButtonVisible="true" 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" 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" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="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_FIXED" width="174" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="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" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="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" x="0" y="0"/>
     </EditField>
 </ScenePanel>
index 455936b..0c98456 100644 (file)
@@ -23,7 +23,7 @@
     <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="46.0" x="24.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.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="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Label id="IDC_FOOTER_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
@@ -47,7 +47,7 @@
     </Button>
     <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="300.0" x="212.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="192.0" x="212.0" y="25.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="534.0" x="376.0" y="10.0"/>
     </EditField>
     <Button id="IDC_PAGEFORWARD_BUTTON" parent="IDC_FOOTER_PANEL">
index 101c89b..1998a37 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="3.0.0.201301081740" Dversion="20120315">
+
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">
     <Panel id="IDL_NOTIFICATION_PANEL">
         <property backgroundColor="#444444" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="54" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="4" y="113"/>
index 87508f4..4a7fd61 100644 (file)
@@ -116,7 +116,7 @@ AddBookmarkForm::OnInitializing(void)
        {
                return E_FAILURE;
        }
-
+       __pScrollPanel->SetPageScrollEnabled(true);
        // Title EditField added on the Scroll Panel
        __pEditFieldTitle = static_cast< EditField* >(__pScrollPanel->GetControl(L"IDC_EDITFIELD1"));
 
@@ -277,9 +277,6 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                        }
                                }
 
-
-
-
                                if(bookMarkID.GetLength() == 0)
                                {
                                        bookMarkID = L"-1";
@@ -322,7 +319,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                                __pBookmark->SetParentId(bookMarkID);
                                        }
 
-                                       r = BookmarkPresentationModel::GetInstance()->SaveBookmark(*__pBookmark);
+                                       r = BookmarkPresentationModel::GetInstance()->SaveTempBookmark(*__pBookmark);
                                        AppLogDebug("ID_BUTTON_DONE SaveBookmark = %s", GetErrorMessage(r));
                                        AppLogDebug("parent id = %ls",__pBookmark->GetParentId().GetPointer());
                                        pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
@@ -368,7 +365,6 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                }
                                else
                                {
-
                                        r = BookmarkPresentationModel::GetInstance()->GetFolder("-1", 0, __folderCount, folderList);
                                        TryCatch( r == E_SUCCESS,,"Failed to intitialize GetFolder %s",GetErrorMessage(r));
 
@@ -376,7 +372,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                        {
                                                BookmarkData* pBookmark = null;
                                                pBookmark = dynamic_cast< BookmarkData* >(folderList.GetAt(count));
-                                               if( pBookmark == NULL )
+                                               if ( pBookmark == NULL )
                                                {
                                                        return;
                                                }
@@ -401,7 +397,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                        {
                                                bookmark.SetFaviconId(__pBookmark->GetFaviconId());
                                        }
-                                       BookmarkPresentationModel::GetInstance()->SaveBookmark(bookmark);
+                                       BookmarkPresentationModel::GetInstance()->SaveTempBookmark(bookmark);
                                        pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
                                }
                        }
@@ -774,7 +770,6 @@ AddBookmarkForm::OnKeypadWillOpen(Control& source)
 void
 AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& currentSceneId, IList* pArgs)
 {
-
        // Code to handle events when the AddBookmarkForm is activated.
        String str = "-1";
        String pageTitle = L"";
index df35232..96f52d2 100644 (file)
@@ -831,7 +831,7 @@ void
 Addressbar::OnKeypadOpened(Tizen::Ui::Control& source)
 {
 //     __pListener->OnAddressBarKeypadOpened(*this);
-       __pListener->OnAddressBarKeypadOpened(*this);
+       __pListener->OnAddressBarKeypadClosed(*this,false);
 }
 
 void
index 879bac0..f8132e4 100644 (file)
  *@brief: Used to define bookmark
  */
 
+#include <FMedia.h>
 #include "IntBookmarkData.h"
 
 using namespace Tizen::Base;
+using namespace Tizen::Media;
+using namespace Tizen::Graphics;
 
 BookmarkData::BookmarkData(void)
        : __bookmarkId("")
@@ -32,6 +35,7 @@ BookmarkData::BookmarkData(void)
        , __parentId("-1")
        , __iconPath("")
     , __faviconId("")
+       , __pFavIconData(null)
 {
        __createdTime.SetValue(0, 0, 0);
        __modifiedTime.SetValue(0, 0, 0);
@@ -180,3 +184,73 @@ BookmarkData::SetFaviconId(const String& strFaviconId)
 {
        __faviconId = strFaviconId;
 }
+
+void
+BookmarkData::SetFavIconBitmap(Tizen::Graphics::Bitmap& favIconImage)
+{
+       Image* pImage = null;
+//     ByteBuffer* pEncodedBuffer = null;
+
+       __favIconWidth = favIconImage.GetWidth();
+       __favIconHeight = favIconImage.GetHeight();
+
+       pImage = new Image();
+       pImage->Construct();
+       //__pFavIconData = pImage->EncodeToBufferN(favIconImage,Tizen::Media::IMG_FORMAT_PNG);
+       __pFavIconData = pImage->EncodeToBufferN(favIconImage,IMG_FORMAT_PNG);
+
+       //__pFavIconData = pImage->DecodeToBufferN(*pEncodedBuffer, IMG_FORMAT_PNG, BITMAP_PIXEL_FORMAT_ARGB8888, __favIconWidth, __favIconHeight);
+
+       delete pImage;
+}
+
+void
+BookmarkData::SetFavIconBuffer(Tizen::Base::ByteBuffer& favIconBuffer)
+{
+       __pFavIconData = &favIconBuffer;
+}
+
+ByteBuffer*
+BookmarkData::GetFavIconBuffer()
+{
+       return __pFavIconData;
+}
+
+Bitmap*
+BookmarkData::GetFavIconBitmap()
+{
+       Bitmap *pBitmap = null;
+
+       if (__pFavIconData != null)
+       {
+               Image *pImage = new(std::nothrow) Image();
+               pImage->Construct();
+               pBitmap = pImage->DecodeN(*__pFavIconData, IMG_FORMAT_PNG, BITMAP_PIXEL_FORMAT_ARGB8888);
+               delete pImage;
+       }
+       return pBitmap;
+}
+
+
+
+int BookmarkData::GetFavIconWidth()
+{
+       return __favIconWidth;
+}
+
+int BookmarkData::GetFavIconHeight()
+{
+       return __favIconHeight;
+}
+
+void
+BookmarkData::SetFavIconWidth(int favIconWidth)
+{
+       __favIconWidth = favIconWidth;
+}
+
+void
+BookmarkData::SetFavIconHeight(int favIconHeight)
+{
+       __favIconHeight = favIconHeight;
+}
index b979660..5df99c7 100644 (file)
@@ -40,6 +40,7 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
+using namespace Tizen::Media;
 
 const wchar_t* DEFAULT_VALUE_PARENTID = L"-1";
 static const wchar_t* IDB_TAB_ICON_BOOKMARK = L"I01_tab_icon_bookmarks.png";
@@ -523,13 +524,24 @@ BookmarkListForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 Tizen::Ui::Controls::ListItemBase*
 BookmarkListForm::CreateItem(int index, int itemWidth)
 {
+
        AppLog("BookmarkListForm::CreateItem index %d , itemWidth %d",index, itemWidth);
        AppLog("listviewwidth %d",__pListview->GetWidth());
        result r = E_FAILURE;
        ListAnnexStyle style = LIST_ANNEX_STYLE_NORMAL;
+       if(__pData == null)
+       {
+               return null;
+       }
        CustomItem* pItem = new(std::nothrow) CustomItem();
+
        BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pData->GetAt(index));
        Bitmap* pBitmap = null;
+       Dimension dim;
+
+       Image* pImage = null;
+       pImage = new Image();
+       pImage->Construct();
 
        const int x_Margin_Icon = 16;                 // local as there used only in this function
        const int y_Margin_Icon = 28;
@@ -579,12 +591,50 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
                AppLogDebug("BookmarkListForm::faviconid %ls",pBookMark->GetFaviconId().GetPointer());
                bitmapId = pBookMark->GetFaviconId();
 
-               pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
-               if (pBitmap == null)
+               dim = Dimension(pBookMark->GetFavIconWidth(), pBookMark->GetFavIconHeight());
+
+               AppLog("BookmarkListForm::CreateItem check 0");
+
+               // get fav icon bitmap
+               ByteBuffer* pFavIconBuffer = null;
+               pFavIconBuffer = pBookMark->GetFavIconBuffer();
+
+               AppLog("BookmarkListForm::CreateItem check 0");
+
+               if (pFavIconBuffer != null)
+               {
+                       AppLog("BookmarkListForm::CreateItem pFavIconBuffer is not null");
+               }
+               else
+               {
+                       AppLog("BookmarkListForm::CreateItem pFavIconBuffer is null");
+               }
+
+               pBitmap = pImage->DecodeN(*pFavIconBuffer, IMG_FORMAT_PNG, BITMAP_PIXEL_FORMAT_ARGB8888);
+
+               AppLog("BookmarkListForm::CreateItem check 1");
+
+               if (pBitmap != null)
+               {
+                       AppLog("rahul bitmap is not null");
+                       int width = pBitmap->GetWidth();
+                       int height = pBitmap->GetHeight();
+                       AppLog("rahul bitmap width is %d", width);
+                       AppLog("rahul bitmap height is %d", height);
+                       AppLog("rahul favicon width is %d", pBookMark->GetFavIconWidth());
+                       AppLog("rahul favicon height is %d", pBookMark->GetFavIconHeight());
+               }
+               else
+               {
+                       AppLog("rahul bitmap is null");
+               }
+
+               //pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
+               /*if (pBitmap == null)
                {
                        AppLogDebug("BookmarkListForm::CreateItem bitmap is null");
                        pBitmap = FaviconManager::GetInstance()->GetDefaultFaviconN();
-               }
+               }*/
                pItem->AddElement(Rectangle(x_Margin_Icon, y_Margin_Icon, width_Icon, height_Icon), IDA_FORMAT_ICON, *pBitmap, null);
                pItem->AddElement(Rectangle(x_Margin_Title, 0, width_Title, itemHeight - height_Url), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),44,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
                if(__pSearchBar->GetMode() == SEARCH_BAR_MODE_INPUT)
@@ -1079,7 +1129,7 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen:
                        __pSearchBar->Invalidate(true);
                }
 
-               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
+               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().width));
        }
 
 
index 5b08486..d1cd4cc 100644 (file)
@@ -21,6 +21,7 @@
  */
 
 #include <cstdlib>
+
 #include "IntBookmarkData.h"
 #include "IntBookmarkPresentationModel.h"
 #include "IntTypes.h"
@@ -199,6 +200,27 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
        String bookmarkUrl = bookmark.GetUrl();
        bookmarkUrl.Replace(L"'", L"''");
 
+       AppLog("BookmarkPresentationModel::SaveBookmark");
+
+       String pFavArray;
+       ByteBuffer* pFavBuffer = bookmark.GetFavIconBuffer();
+       if(pFavBuffer != null)
+       {
+               AppLog("Buffer found");
+               pFavBuffer->Flip();
+
+               wchar_t value;
+
+               AppLog("BookmarkPresentationModel::SaveBookmark 0 ");
+
+               while(pFavBuffer->HasRemaining())
+               {
+                       pFavBuffer->GetWchar(value);
+                       pFavArray.Append(value);
+               }
+       }
+
+       AppLog("BookmarkPresentationModel::SaveBookmark 1 pFavArray(%d) is %ls",pFavArray.GetLength(), pFavArray.GetPointer());
 
        PresentationModelBase::GetCurrentDateTime(dt);
        if (bookmark.GetBookmarkId() == "")
@@ -209,7 +231,11 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
                columnNames.Append(L"TITLE, ");
                columnNames.Append(L"CREATIONDATE, ");
                columnNames.Append(L"UPDATEDATE");
-               //columnNames.Append(L"ICON_PATH, ");
+               columnNames.Append(L"FAVICON, ");
+               //      columnNames.Append(L"FAVICON_LENGTH, ");
+               columnNames.Append(L"FAVICON_W, ");
+               columnNames.Append(L"FAVICON_H");
+               //columnNames.Append(L"FAVICON_ID"
                //columnNames.Append(L"FAVICON_ID");
 
                query.Append(L"INSERT INTO ");
@@ -233,6 +259,13 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
                query.Append("', ");
                query.Append("'");
                query.Append(dt.ToString());
+               query.Append("', ");
+               query.Append("'");
+               query.Append(pFavArray);
+               query.Append("', ");
+               query.Append(bookmark.GetFavIconWidth());
+               query.Append(", ");
+               query.Append(bookmark.GetFavIconHeight());
                /*query.Append("', ");
                query.Append("'");
                query.Append(bookmark.GetIconPath());
@@ -240,7 +273,6 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
                query.Append(", ");
                query.Append("'");
                query.Append(bookmark.GetFaviconId());*/
-               query.Append("'");
                query.Append(")");
        }
        else
@@ -322,6 +354,101 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
 }
 
 result
+BookmarkPresentationModel::SaveTempBookmark(BookmarkData& bookmark)
+{
+       result r = E_FAILURE;
+       String bookmarkTable(BOOKMARK_URL_TABLE);
+       String query;
+       String columnNames;
+       String attachment;
+       int resultCount = -1;
+       int rowId = -1;
+       DateTime dt;
+       String bookmarkId;
+       String bookmarkTitle = bookmark.GetBookmarkTitle();
+       bookmarkTitle.Replace(L"'", L"''");
+       String bookmarkUrl = bookmark.GetUrl();
+       bookmarkUrl.Replace(L"'", L"''");
+
+       PresentationModelBase::GetCurrentDateTime(dt);
+
+       if (bookmark.GetBookmarkId() == "")
+       {
+               columnNames.Append(L"TYPE, ");
+               columnNames.Append(L"PARENT, ");
+               columnNames.Append(L"ADDRESS, ");
+               columnNames.Append(L"TITLE, ");
+               columnNames.Append(L"CREATIONDATE, ");
+               columnNames.Append(L"UPDATEDATE, ");
+
+               columnNames.Append(L"FAVICON, ");
+               columnNames.Append(L"FAVICON_W, ");
+               columnNames.Append(L"FAVICON_H");
+
+               query.Append(L"INSERT INTO ");
+               query.Append(bookmarkTable);
+               query.Append("(");
+               query.Append(columnNames);
+               query.Append(") ");
+               query.Append("VALUES");
+               query.Append(" (?,?,?,?,?,?,?,?,?)");
+               r = PresentationModelBase::ExecuteBookmarkQuery(query, resultCount, bookmark);
+       }
+       else
+       {
+               query.Append(L"UPDATE ");
+               query.Append(bookmarkTable);
+               query.Append(" SET PARENT = ");
+               query.Append(bookmark.GetParentId());
+               query.Append(", ADDRESS = ");
+               query.Append("'");
+               query.Append(bookmarkUrl);
+               query.Append("'");
+               query.Append(", TITLE = ");
+               query.Append("'");
+               query.Append(bookmarkTitle);
+               query.Append("'");
+               query.Append(", UPDATEDATE = ");
+               query.Append("'");
+               query.Append(dt.ToString());
+               query.Append("'");
+               query.Append(" WHERE ID = ");
+               query.Append(bookmark.GetBookmarkId());
+               r = PresentationModelBase::ExecuteQuery(query, resultCount);
+       }
+
+
+       AppLog("BookmarkPresentationModel::SaveBookmark query is %S",query.GetPointer());
+
+       if (r == E_SUCCESS)
+       {
+               AppLog("BookmarkPresentationModel::SaveBookmark query is success");
+       }
+       else
+       {
+               AppLog("BookmarkPresentationModel::SaveBookmark query is failure");
+       }
+
+       TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::SaveBookmark query failed  %s",GetErrorMessage(r));
+
+       r = PresentationModelBase::CommitDb();
+
+       r = GetLastInsertedId(bookmarkTable, rowId);
+       TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::SaveBookmark GetLastInsertedId failed %s",GetErrorMessage(r));
+
+       if (rowId < 0)
+               return E_FAILURE;
+
+       bookmarkId.Append(rowId);
+
+       //Set the generated ID to Bookmark
+       bookmark.SetBookmarkId(bookmarkId);
+
+    CATCH: return r;
+
+}
+
+result
 BookmarkPresentationModel::DeleteFolder(int folderId)
 {
        result r = E_SUCCESS;
@@ -943,6 +1070,7 @@ BookmarkPresentationModel::CreateFolderList(int bookmarkCount, ArrayList& folder
 result
 BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& bookmarkList)
 {
+       AppLog("BookmarkPresentationModel::CreateBookmarkList start");
        BookmarkData* pBookmark = null;
        int intVal = -1;
        String value;
@@ -953,6 +1081,8 @@ BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& book
        String faviconId;
        DateTime createdTime;
        DateTime modifiedTime;
+       ByteBuffer *pFavIconBuffer = null;
+
        String iconPath;
        bool nextRowPresent = false;
 
@@ -960,6 +1090,7 @@ BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& book
        {
                return E_SUCCESS;
        }
+
        for (int l_bookmarkCount = 0; l_bookmarkCount < bookmarkCount; l_bookmarkCount++)
        {
                r = PresentationModelBase::DbIsNextRowPresent(nextRowPresent);
@@ -1024,7 +1155,11 @@ BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& book
                                                        pBookmark->SetCreatedTime(createdTime);
                                                }
                                                break;
+                                       case BOOKMARK_SEQUENCE:
+                                       {
 
+                                       }
+                                       break;
                                        case BOOKMARK_UPDATEDATA:
                                                r = PresentationModelBase::GetColumn(columnCount, dateValue);
                                                if (!IsFailed(r))
@@ -1033,8 +1168,74 @@ BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& book
                                                        pBookmark->SetModifiedTime(modifiedTime);
                                                }
                                                break;
+                                       case BOOKMARK_VISITDATE:
+                                       {
 
-                                               /*case 6:
+                                       }
+                                       break;
+                                       case BOOKMARK_EDITABLE:
+                                       {
+
+                                       }
+                                       break;
+                                       case BOOKMARK_ACCESSACCOUNT:
+                                       {
+
+                                       }
+                                       break;
+                                       case BOOKMARK_FAVICON:
+                                       {
+                                               AppLog("BookmarkPresentationModel::CreateBookmarkList BOOKMARK_FAVICON 0");
+                                               pFavIconBuffer = new ByteBuffer();
+                                               r = PresentationModelBase::GetColumn(columnCount, *pFavIconBuffer);
+                                               AppLog("BookmarkPresentationModel::CreateBookmarkList BOOKMARK_FAVICON 1");
+                                               if (pFavIconBuffer->GetCapacity() > 0)
+                                               {
+                                                       AppLog("BookmarkPresentationModel::CreateBookmarkList favIconBuffer not null");
+                                               }
+                                               else
+                                               {
+                                                       AppLog("BookmarkPresentationModel::CreateBookmarkList favIconBuffer is null");
+                                               }
+
+                                               if (!IsFailed(r))
+                                               {
+                                                       iconPath = value;
+                                                       pBookmark->SetFavIconBuffer(*pFavIconBuffer);
+                                               }
+                                       }
+                                       break;
+                                       case BOOKMARK_FAVICON_LENGTH:
+                                       {
+
+                                       }
+                                       break;
+                                       case BOOKMARK_FAVICON_W:
+                                       {
+                                               r = PresentationModelBase::GetColumn(columnCount, intVal);
+                                               if (!IsFailed(r))
+                                               {
+                                                       if (intVal > 0)
+                                                       {
+                                                               pBookmark->SetFavIconWidth(intVal);
+                                                       }
+                                               }
+                                       }
+                                       break;
+                                       case BOOKMARK_FAVICON_H:
+                                       {
+                                               r = PresentationModelBase::GetColumn(columnCount, intVal);
+                                               if (!IsFailed(r))
+                                               {
+                                                       if (intVal > 0)
+                                                       {
+                                                               pBookmark->SetFavIconHeight(intVal);
+                                                       }
+                                               }
+                                       }
+                                       break;
+                                               /*
+                                                *case 6:
                                                r = PresentationModelBase::GetColumn(columnCount, value);
                                                if (!IsFailed(r))
                                                {
@@ -1074,6 +1275,7 @@ BookmarkPresentationModel::CreateBookmarkList(int bookmarkCount, ArrayList& book
                        }
                }
        }
+       AppLog("BookmarkPresentationModel::CreateBookmarkList end");
        return r;
 }
 
index 2a395da..b3dd537 100644 (file)
@@ -158,6 +158,11 @@ BrightnessForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        AppLog("BrightnessForm tab value is %d",tabValue);
        AppLog("BrightnessForm slider value is %d",sliderValue);
 
+       if(__pBrightnessSlider == null)
+       {
+               return;
+       }
+
        if(tabValue == 0)
        {
                __pBrightnessSlider->SetEnabled(false);
index fefea5d..a81da5a 100644 (file)
@@ -437,8 +437,7 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
                r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128), style);
                TryCatch( r == E_SUCCESS,,"EditBookmarkListForm::CreateItem contruct item failed  %s",GetErrorMessage(r));
 
-               bitmapId = pBookMark->GetFaviconId();
-               pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
+               pBitmap = pBookMark->GetFavIconBitmap();
 
                if (pBitmap == null)
                {
index 57c0929..02a5bd0 100644 (file)
@@ -71,7 +71,7 @@ EditHistoryListForm::~EditHistoryListForm(void)
        if (__pGroupData != null)
        {
                AppLog("removing __pGroupData");
-               __pGroupData->RemoveAll(true);
+               __pGroupData->RemoveAll(false);
                delete __pGroupData;
        }
 }
@@ -504,9 +504,9 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128), LIST_ANNEX_STYLE_MARK);
 
-       bitmapId = pHistory->GetFaviconId();
 
-       pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
+
+       pBitmap = pHistory->GetFavIconBitmap();
        if (pBitmap == null)
        {
                pBitmap = FaviconManager::GetInstance()->GetDefaultFaviconN();
index 634e369..6da60cc 100644 (file)
@@ -45,6 +45,9 @@ History::History(void)
     , __visitedCount(0)
        , __pThumbnail(null)
     , __thumbnailPath("")
+       ,__pFavIconData(null)
+       ,__favIconHeight(0)
+       ,__favIconWidth(0)
 {
        AppLog("History::History(void)");
        __visitedTime.SetValue(0,0,0);
@@ -208,3 +211,68 @@ History::SetThumbnailPath(String& thumbnailPath)
 {
        __thumbnailPath = thumbnailPath;
 }
+
+void
+History::SetFavIconBitmap(Tizen::Graphics::Bitmap& favIconImage)
+{
+       Image* pImage = null;
+       pImage = new Image();
+       pImage->Construct();
+       __pFavIconData = pImage->EncodeToBufferN(favIconImage,Tizen::Media::IMG_FORMAT_PNG);
+
+       __favIconWidth = favIconImage.GetWidth();
+       __favIconHeight = favIconImage.GetHeight();
+
+       delete pImage;
+}
+
+void
+History::SetFavIconBuffer(Tizen::Base::ByteBuffer& favIconBuffer)
+{
+       __pFavIconData = &favIconBuffer;
+}
+
+ByteBuffer*
+History::GetFavIconBuffer()
+{
+       return __pFavIconData;
+}
+
+Bitmap*
+History::GetFavIconBitmap()
+{
+       Bitmap *pBitmap = null;
+
+       if (__pFavIconData != null)
+       {
+               Image *pImage = new(std::nothrow) Image();
+               pImage->Construct();
+               pBitmap = pImage->DecodeN(*__pFavIconData, IMG_FORMAT_PNG, BITMAP_PIXEL_FORMAT_ARGB8888);
+               delete pImage;
+       }
+       return pBitmap;
+}
+
+int
+History::GetFavIconWidth()
+{
+       return __favIconWidth;
+}
+
+int
+History::GetFavIconHeight()
+{
+       return __favIconHeight;
+}
+
+void
+History::SetFavIconWidth(int width)
+{
+       __favIconWidth = width;
+}
+
+void
+History::SetFavIconHeight(int height)
+{
+       __favIconHeight = height;
+}
index 07d3a18..ec4d014 100644 (file)
@@ -73,7 +73,7 @@ HistoryListForm::~HistoryListForm(void)
 {
        if (__pGroupData != null)
        {
-               __pGroupData->RemoveAll(true);
+               __pGroupData->RemoveAll(false);
                delete __pGroupData;
        }
 }
@@ -447,6 +447,12 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        Bitmap* pBookmarkBitmap = null;
        String bitmapId;
 
+       if(__pGroupData == null)
+       {
+               delete pItem;
+               return null;
+       }
+
        if (pItem == null)
        {
                return null;
@@ -472,7 +478,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        bitmapId = pHistory->GetFaviconId() ;
 
-       pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
+       pBitmap = pHistory->GetFavIconBitmap();
 
        if (pBitmap == null)
        {
@@ -1160,7 +1166,7 @@ void
 HistoryListForm::OnKeypadWillOpen(Control& source)
 {
        GetFooter()->SetShowState(false);
-       __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
+       __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->SetEnabled(false);
        __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
        Invalidate(true);
@@ -1206,7 +1212,7 @@ HistoryListForm::CreateGroupItems()
 
        if (__pGroupData != null)
        {
-               __pGroupData->RemoveAll(true);
+               __pGroupData->RemoveAll(false);
                delete __pGroupData;
                __pGroupData = null;
        }
index 737e294..ef939a7 100644 (file)
@@ -77,7 +77,7 @@ void HistoryPresentationModel::DestroyInstance(void)
 
 HistoryPresentationModel::HistoryPresentationModel(void)
 {
-
+       __pDataList = null;
 }
 
 HistoryPresentationModel::~HistoryPresentationModel(void)
@@ -124,7 +124,7 @@ HistoryPresentationModel::SaveHistory(History& history)
        ArrayList* pMostVisitedSites = null;
        bool isAlreadyExist = false;
        bool isEligibleForMostVisitedSites = true;
-       int i;
+       int count;
        String thumbnailPath;
        int todaysCount = 0;
        DateTime todayStart;
@@ -165,9 +165,9 @@ HistoryPresentationModel::SaveHistory(History& history)
        PresentationModelBase::GetCurrentDateTime(date);
        GetMostVisitedSites(*pMostVisitedSites);
        GetUrlCount(historyUrl, urlCount);
-       for (i = 0; i < pMostVisitedSites->GetCount(); i++)
+       for (count = 0; count < pMostVisitedSites->GetCount(); count++)
        {
-               History* pHistory = static_cast< History* >(pMostVisitedSites->GetAt(i));
+               History* pHistory = static_cast< History* >(pMostVisitedSites->GetAt(count));
                if (pHistory != null && pHistory->GetHistoryUrl().CompareTo(historyUrl) == 0)
                {
                        AppLog("HistoryPresentationModel::saveHistory isalreadyexist true");
@@ -203,62 +203,34 @@ HistoryPresentationModel::SaveHistory(History& history)
        delete pMostVisitedSites;
        pMostVisitedSites = NULL ;
 
+       String pFavArray;
+       ByteBuffer* pFavBuffer = history.GetFavIconBuffer();
+       if(pFavBuffer != null)
+       {
+               AppLog("Buffer found");
+               pFavBuffer->Flip();
+
+               wchar_t value;
+
+               AppLog("BookmarkPresentationModel::SaveBookmark 0 ");
+
+               while(pFavBuffer->HasRemaining())
+               {
+                       pFavBuffer->GetWchar(value);
+                       pFavArray.Append(value);
+               }
+       }
+
        if (history.GetHistoryId() == "")
        {
                AppLog("HistoryPresentationModel::saveHistory GetHistoryId is blank");
-               /*
-               columnNames.Append(L"TITLE, ");
-               columnNames.Append(L"URL, ");
-               columnNames.Append(L"VISITED_TIME, ");
-               columnNames.Append(L"ICON_PATH, ");
-               columnNames.Append(L"FAVICON_ID, ");
-               columnNames.Append(L"THUMBNAIL_PATH");
 
-               query.Append(L"INSERT INTO ");
-               query.Append(historyTable);
-               query.Append("(");
-               query.Append(columnNames);
-               query.Append(") ");
-               query.Append("VALUES(");
-               query.Append("'");
-               query.Append(historyTitle);
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(historyUrl);
-               query.Append("', ");
-               query.Append("DateTime(");
-               query.Append("'");
-               query.Append(GetStringFromDate(date));
-               query.Append("'), ");
-               query.Append("'");
-               query.Append(history.GetHistoryIconPath());
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(history.GetFaviconId());
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(thumbnailPath);
-               query.Append("'");
-               query.Append(")");
-        */
                columnNames.Append(L"ADDRESS, ");
                columnNames.Append(L"TITLE, ");
-               //columnNames.Append(L"COUNTER, ");
-               columnNames.Append(L"VISITDATE");
-       //      columnNames.Append(L"FAVICON, ");
-       //      columnNames.Append(L"FAVICON_LENGTH, ");
-       //      columnNames.Append(L"FAVICON_W, ");
-       //      columnNames.Append(L"FAVICON_H, ");
-       //      columnNames.Append(L"SNAPSHOT, ");
-       //      columnNames.Append(L"SNAPSHOT_STRIDE, ");
-       //      columnNames.Append(L"SNAPSHOT_W, ");
-       //      columnNames.Append(L"SNAPSHOT_H");
-       //      columnNames.Append(L"ICON_PATH, ");
-       //      columnNames.Append(L"FAVICON_ID, ");
-       //      columnNames.Append(L"THUMBNAIL_PATH");
+               columnNames.Append(L"VISITDATE, ");
+               columnNames.Append(L"FAVICON, ");
+               columnNames.Append(L"FAVICON_W, ");
+               columnNames.Append(L"FAVICON_H");
 
                query.Append(L"INSERT INTO ");
                query.Append(historyTable);
@@ -276,53 +248,196 @@ HistoryPresentationModel::SaveHistory(History& history)
                query.Append("DateTime(");
                query.Append("'");
                query.Append(GetStringFromDate(date));
-               query.Append("'))");
-
-               //query.Append("'), ");
-               //query.Append("'");
-               //query.Append(history.GetHistoryIconPath());
-               //query.Append("'");
-               //query.Append(", ");
-               //query.Append("'");
-               //query.Append(history.GetFaviconId());
-               //query.Append("'");
-               //query.Append(", ");
-               //query.Append("'");
-               //query.Append(thumbnailPath);
-               //query.Append("'");
-               //query.Append(")");
+               query.Append(")', ");
+               query.Append("'");
+               query.Append(pFavArray);
+               query.Append("', ");
+               query.Append(history.GetFavIconWidth());
+               query.Append(", ");
+               query.Append(history.GetFavIconHeight());
+               query.Append(")");
        }
        else
        {
-               /*query.Append(L"UPDATE ");
+               query.Append(L"UPDATE ");
                query.Append(historyTable);
-               query.Append(" SET TITLE = ");
+               query.Append(" SET ADDRESS = ");
                query.Append("'");
-               query.Append(historyTitle);
+               query.Append(historyUrl);
                query.Append("'");
-               query.Append(", URL = ");
+               query.Append(", TITLE = ");
                query.Append("'");
-               query.Append(historyUrl);
+               query.Append(historyTitle);
                query.Append("'");
                query.Append(", VISITED_TIME = ");
                query.Append("DateTime(");
                query.Append("'");
                query.Append(GetStringFromDate(date));
                query.Append("')");
-               query.Append(", ICON_PATH = ");
-               query.Append("'");
-               query.Append(history.GetHistoryIconPath());
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(history.GetFaviconId());
+               query.Append("', ");
                query.Append("'");
+               query.Append(pFavArray);
+               query.Append("', ");
+               query.Append(history.GetFavIconWidth());
                query.Append(", ");
-               query.Append("'");
-               query.Append(thumbnailPath);
-               query.Append("'");
+               query.Append(history.GetFavIconHeight());
                query.Append(" WHERE ID = ");
-               query.Append(history.GetHistoryId());*/
+               query.Append(history.GetHistoryId());
+
+       }
+
+       AppLog("HistoryPresentationModel::SaveHistory query is %S",query.GetPointer());
+
+       r = PresentationModelBase::ExecuteQuery(query, resultCount);
+       if (r == E_SUCCESS)
+       {
+               AppLog("HistoryPresentationModel::SaveHistory result is success");
+       }
+       else
+       {
+               AppLog("HistoryPresentationModel::SaveHistory result is failure");
+       }
+       TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::SaveHistory query failed  %s",GetErrorMessage(r));
+
+       r = PresentationModelBase::CommitDb();
+
+       r = GetLastInsertedId(historyTable, rowId);
+       if (IsFailed(r))
+       {
+               AppLogDebug("PresentationModelBase::saveHistory -(%s)\n", GetErrorMessage(r));
+               return r;
+       }
+       if (rowId < 0)
+               return E_FAILURE;
+
+       historyId.Append(rowId);
+       if (historyId.GetLength() < 0)
+       {
+               return E_FAILURE;
+       }
+       //Set the generated ID to History
+       history.SetHistoryId(historyId);
+
+       CATCH: return r;
+}
+
+result
+HistoryPresentationModel::SaveTempHistory(History& history)
+{
+       AppLog("HistoryPresentationModel::saveHistory");
+       result r = E_FAILURE;
+       String historyTable(HISTORY_DATA_TABLE);
+       String query;
+       String columnNames;
+       String attachment;
+       int resultCount = -1;
+       int rowId = -1;
+       DateTime date;
+       String historyId;
+       int urlCount = 0;
+       ArrayList* pMostVisitedSites = null;
+       bool isAlreadyExist = false;
+       bool isEligibleForMostVisitedSites = true;
+       int i;
+       String thumbnailPath;
+       int todaysCount = 0;
+       DateTime todayStart;
+       DateTime todayEnd;
+       SystemTime::GetCurrentTime(todayStart);
+       SystemTime::GetCurrentTime(todayEnd);
+       todayStart.SetValue(todayStart.GetYear(), todayStart.GetMonth(), todayStart.GetDay(), 0,0,0);
+       todayEnd.SetValue(todayStart.GetYear(), todayStart.GetMonth(), todayStart.GetDay(), 23,59,59);
+
+       ArrayList* pTodaysList = new(std::nothrow) ArrayList();
+       pTodaysList->Construct();
+       GetHistoryCountWithTimeRange(todayStart, todayEnd, todaysCount);
+       GetHistoryWithTimeRange(todayStart, todayEnd, 0, todaysCount, *pTodaysList);
+
+       for(int count = 0; count < todaysCount; count++)
+       {
+               History *pHistoryItem  = dynamic_cast<History*>(pTodaysList->GetAt(count));
+               //AppLog("HistoryPresentationModel::saveHistory pHistoryItem id is %ls",pHistoryItem->GetHistoryId().GetPointer());
+               AppLog("SaveHistory pHistoryItem url is %ls",pHistoryItem->GetHistoryUrl().GetPointer());
+               AppLog("SaveHistory history url is %ls",history.GetHistoryUrl().GetPointer());
+
+               if(pHistoryItem != null && pHistoryItem->GetHistoryUrl().CompareTo(history.GetHistoryUrl()) == 0)
+               {
+                       history.SetHistoryId(pHistoryItem->GetHistoryId());
+                       AppLog("HistoryPresentationModel::saveHistory pHistoryItem history is %ls",pHistoryItem->GetHistoryId().GetPointer());
+                       break;
+               }
+       }
+
+       pMostVisitedSites = new(std::nothrow) ArrayList();
+       pMostVisitedSites->Construct();
+       String historyTitle = history.GetHistoryTitle();
+       historyTitle.Replace(L"'", L"''");
+
+       String historyUrl = history.GetHistoryUrl();
+       historyUrl.Replace(L"'", L"''");
+
+       PresentationModelBase::GetCurrentDateTime(date);
+       GetMostVisitedSites(*pMostVisitedSites);
+       GetUrlCount(historyUrl, urlCount);
+       for (i = 0; i < pMostVisitedSites->GetCount(); i++)
+       {
+               History* pHistory = static_cast< History* >(pMostVisitedSites->GetAt(i));
+               if (pHistory != null && pHistory->GetHistoryUrl().CompareTo(historyUrl) == 0)
+               {
+                       AppLog("HistoryPresentationModel::saveHistory isalreadyexist true");
+                       isAlreadyExist = true;
+                       break;
+               }
+               if ( pHistory != null &&  urlCount >= pHistory->GetVisitedCount())
+               {
+                       isEligibleForMostVisitedSites = true;
+               }
+               else
+               {
+                       isEligibleForMostVisitedSites = false;
+               }
+       }
+
+       if (pMostVisitedSites->GetCount() < 9 || (isAlreadyExist == false && isEligibleForMostVisitedSites == true && history.GetThumbnail() != null))
+       {
+               AppLog("HistoryPresentationModel::SaveHistory coming here");
+
+               thumbnailPath = GenerateFileName();
+               AppLog("generating file path and url %ls, %ls",thumbnailPath.GetPointer(),historyUrl.GetPointer());
+               Image* pImage = new(std::nothrow) Image();
+               pImage->Construct();
+               result r = pImage->EncodeToFile(*history.GetThumbnail(), IMG_FORMAT_JPG, thumbnailPath, true);
+               delete pImage;
+               if(IsFailed(r))
+               {
+                       AppLogDebug("PresentationModelBase::saveHistory -(%s)\n", GetErrorMessage(r));
+                       return r;
+               }
+       }
+       delete pMostVisitedSites;
+       pMostVisitedSites = NULL ;
+
+       if (history.GetHistoryId() == "")
+       {
+               AppLog("HistoryPresentationModel::saveHistory GetHistoryId is blank");
+
+               columnNames.Append(L"ADDRESS, ");
+               columnNames.Append(L"TITLE, ");
+               columnNames.Append(L"VISITDATE, ");
+               columnNames.Append(L"FAVICON, ");
+               columnNames.Append(L"FAVICON_W, ");
+               columnNames.Append(L"FAVICON_H");
+
+               query.Append(L"INSERT INTO ");
+               query.Append(historyTable);
+               query.Append("(");
+               query.Append(columnNames);
+               query.Append(") ");
+               query.Append("VALUES");
+               query.Append(" (?,?,?,?,?,?)");
+       }
+       else
+       {
                query.Append(L"UPDATE ");
                query.Append(historyTable);
                query.Append(" SET ADDRESS = ");
@@ -338,26 +453,14 @@ HistoryPresentationModel::SaveHistory(History& history)
                query.Append("'");
                query.Append(GetStringFromDate(date));
                query.Append("')");
-               /*query.Append(", ICON_PATH = ");
-               query.Append("'");
-               query.Append(history.GetHistoryIconPath());
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(history.GetFaviconId());
-               query.Append("'");
-               query.Append(", ");
-               query.Append("'");
-               query.Append(thumbnailPath);*/
                query.Append("'");
                query.Append(" WHERE ID = ");
                query.Append(history.GetHistoryId());
-
        }
 
        AppLog("HistoryPresentationModel::SaveHistory query is %S",query.GetPointer());
 
-       r = PresentationModelBase::ExecuteQuery(query, resultCount);
+       r = PresentationModelBase::ExecuteHistoryQuery(query, resultCount, history);
        if (r == E_SUCCESS)
        {
                AppLog("HistoryPresentationModel::SaveHistory result is success");
@@ -387,7 +490,14 @@ HistoryPresentationModel::SaveHistory(History& history)
        //Set the generated ID to History
        history.SetHistoryId(historyId);
 
+       if(__pDataList)
+       {
+               delete __pDataList;
+               __pDataList = null;
+       }
+
        CATCH: return r;
+
 }
 
 result
@@ -426,6 +536,12 @@ HistoryPresentationModel::DeleteMultipleHistory(ArrayList* pHistoryIdList)
 
        r = PresentationModelBase::CommitDb();
 
+       if(__pDataList)
+       {
+               delete __pDataList;
+               __pDataList = null;
+       }
+
        CATCH: return r;
 }
 
@@ -452,6 +568,12 @@ HistoryPresentationModel::DeleteHistory(const int historyId)
 
        r = PresentationModelBase::CommitDb();
 
+       if(__pDataList)
+       {
+               delete __pDataList;
+               __pDataList = null;
+       }
+
        CATCH: return r;
 }
 
@@ -474,6 +596,12 @@ HistoryPresentationModel::DeleteHistory(String& historyUrl)
 
        r = PresentationModelBase::CommitDb();
 
+       if(__pDataList)
+       {
+               delete __pDataList;
+               __pDataList = null;
+       }
+
        CATCH: return r;
 }
 
@@ -533,45 +661,41 @@ HistoryPresentationModel::GetHistoryCount(int& historyCount)
 result
 HistoryPresentationModel::GetHistoryCountWithTimeRange(Tizen::Base::DateTime& startTime, Tizen::Base::DateTime& endTime, int& historyCount)
 {
-
-       int count = -1;
-       int intVal = -1;
-       String query;
-       String historyTable(HISTORY_DATA_TABLE);
-       result r = E_FAILURE;
-       bool nextRowPresent = false;
-
-       query.Append(L"SELECT COUNT(ID) FROM ");
-       query.Append(historyTable);
-       query.Append(" WHERE VISITDATE >= ");
-       query.Append("DateTime(");
-       query.Append("'");
-       query.Append(GetStringFromDate(startTime));
-       query.Append("')");
-       query.Append(" AND VISITDATE <= ");
-       query.Append("DateTime(");
-       query.Append("'");
-       query.Append(GetStringFromDate(endTime));
-       query.Append("')");
-
-       r = PresentationModelBase::ExecuteQuery(query, count);
-       TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::GetHistoryCountWithTimeRange query failed %s",GetErrorMessage(r));
-
-       r = PresentationModelBase::DbIsNextRowPresent(nextRowPresent);
-       if (IsFailed(r))
-               return r;
-       if (nextRowPresent == true)
+       int count = 0;
+       result r = E_SUCCESS;
+       if(__pDataList == null)
        {
-               r = PresentationModelBase::GetColumn(0, intVal);
-               if (IsFailed(r))
+               __pDataList = new(std::nothrow) ArrayList();
+               __pDataList->Construct();
+
+               r = GetHistoryCount(count);
+               if(IsFailed(r))
                {
-                       AppLogDebug("Error:PresentationModelBase::DbGetColumn:%s", GetErrorMessage(r));
                        return r;
                }
+               if(count > 0)
+               {
+                       r = GetHistory(0, count, *__pDataList);
+                       if(IsFailed(r))
+                       {
+                               return r;
+                       }
+               }
+       }
+       else
+       {
+               count = __pDataList->GetCount();
        }
-       historyCount = intVal;
 
-       CATCH: return r;
+       for (int counter = 0 ; counter < count; counter++)
+       {
+               History *pHistory = dynamic_cast<History*>(__pDataList->GetAt(counter));
+               if(pHistory != null && pHistory->GetVisitedTime().CompareTo(startTime) > 0 && pHistory->GetVisitedTime().CompareTo(endTime) < 0)
+               {
+                       historyCount++;
+               }
+       }
+       return r;
 }
 
 result
@@ -583,43 +707,9 @@ HistoryPresentationModel::GetHistory(const int startIndex,const int limit, Array
        String historyTable(HISTORY_DATA_TABLE);
        result r = E_FAILURE;
 
-       query.Append(L"SELECT");
-       query.Append(historyTable);
-       query.Append(L".*, ");
-       query.Append(BOOKMARK_URL_TABLE);
-       query.Append(L".ID ");
-       query.Append(L"FROM ");
+       query.Append(L"SELECT * from ");
        query.Append(historyTable);
-       query.Append(L", ");
-       query.Append(BOOKMARK_URL_TABLE);
-       query.Append(L" WHERE ");
-       query.Append(historyTable);
-       query.Append(L".ADDRESS ");
-       query.Append(L"IN");
-       query.Append(L"(");
-       query.Append(L"SELECT");
-       query.Append(historyTable);
-       query.Append(L".ADDRESS ");
-       query.Append(L"FROM ");
-       query.Append(BOOKMARK_URL_TABLE);
-       query.Append(L" LEFT JOIN ");
-       query.Append(historyTable);
-       query.Append(L"ON");
-       query.Append(BOOKMARK_URL_TABLE);
-       query.Append(L".ADDRESS = ");
-       query.Append(historyTable);
-       query.Append(L".ADDRESS ");
-       query.Append(" ORDER BY");
-       query.Append(historyTable);
-       query.Append(L".VISITDATE DESC");
-       query.Append(")");
-       query.Append(" GROUP BY ");
-       query.Append(historyTable);
-       query.Append(L".ADDRESS ");
-       query.Append(" ORDER BY");
-       query.Append(L"COUNT(");
-       query.Append(historyTable);
-       query.Append(L".ADDRESS) DESC ");
+       query.Append(" ORDER BY VISITDATE DESC");
 
 
        //Append LIMIT
@@ -666,6 +756,7 @@ HistoryPresentationModel::CreateHistoryList(int historyCount, ArrayList& history
        bool nextRowPresent = false;
        Image image;
        Bitmap* pThumnailBitmap = null;
+       ByteBuffer *pFavIconBuffer;
 
        image.Construct();
        if (historyCount < 1)
@@ -720,6 +811,7 @@ HistoryPresentationModel::CreateHistoryList(int historyCount, ArrayList& history
                                                        pHistory->SetHistoryTitle(stringVal);
                                                }
                                                break;
+
                                        case HISTORY_VISITED_TIME:
                                                r = PresentationModelBase::GetColumn(columnCount, dateVal);
                                                if (!IsFailed(r))
@@ -729,62 +821,46 @@ HistoryPresentationModel::CreateHistoryList(int historyCount, ArrayList& history
                                                }
                                                break;
 
-                                               /*case HISTORY_ICON_PATH:
-                                                       r = PresentationModelBase::GetColumn(columnCount, stringVal);
-                                                       if (!IsFailed(r))
-                                                       {
-                                                               iconPath = stringVal;
-                                                               pHistory->SetIconPath(iconPath);
-                                                       }
-                                                       break;
-
-                                               case HISTORY_FAVICONID:
+                                       case HISTORY_FAVICON:
+                                       {
+                                               pFavIconBuffer = new ByteBuffer();
+                                               r = PresentationModelBase::GetColumn(columnCount, *pFavIconBuffer);
+                                               if (!IsFailed(r))
+                                               {
+                                                       pHistory->SetFavIconBuffer(*pFavIconBuffer);
+                                               }
+                                       }
+                                       break;
+                                       case HISTORY_FAVICON_LENGTH:
+                                       {
 
-                                                       r = PresentationModelBase::GetColumn(columnCount, intVal);
-                                                       if (!IsFailed(r))
-                                                       {
-                                                               if (intVal >= 0)
-                                                               {
-                                                                       faviconId.Clear();
-                                                                       faviconId.Append(intVal);
-                                                                       if (faviconId.GetLength() > 0)
-                                                                       {
-                                                                               pHistory->SetFaviconId(faviconId);
-                                                                       }
-                                                               }
-                                                       }
-                                                       break;
-                                               case HISTORY_THUMBNAIL:
-                                                       r = PresentationModelBase::GetColumn(columnCount, stringVal);
-                                                       if (!IsFailed(r))
+                                       }
+                                       break;
+                                       case HISTORY_FAVICON_W:
+                                       {
+                                               r = PresentationModelBase::GetColumn(columnCount, intVal);
+                                               if (!IsFailed(r))
+                                               {
+                                                       if (intVal > 0)
                                                        {
-
-                                                               thumbnailPath = stringVal;
-                                                               pThumnailBitmap = image.DecodeN(thumbnailPath, BITMAP_PIXEL_FORMAT_RGB565);
-                                                               if (pThumnailBitmap != null)
-                                                               {
-                                                                       pHistory->SetThumbnail(pThumnailBitmap);
-                                                                       pHistory->SetThumbnailPath(thumbnailPath);
-                                                               }
+                                                               pHistory->SetFavIconWidth(intVal);
                                                        }
-                                                       break;*/
-                               /*      case HISTORY_BOOKMARK_ID:
+                                               }
+                                       }
+                                       break;
+                                       case HISTORY_FAVICON_H:
+                                       {
                                                r = PresentationModelBase::GetColumn(columnCount, intVal);
                                                if (!IsFailed(r))
                                                {
                                                        if (intVal > 0)
                                                        {
-                                                               bookmarkId.Clear();
-                                                               bookmarkId.Append(intVal);
-                                                               if (bookmarkId.GetLength() > 0)
-                                                               {
-                                                                       pHistory->SetBookmarkId(bookmarkId);
-                                                               }
+                                                               pHistory->SetFavIconHeight(intVal);
                                                        }
-
                                                }
-                                               break;
-                                               */
+                                       }
+                                       break;
+
                                        case HISTORY_VISITED_COUNT:
                                                r = PresentationModelBase::GetColumn(columnCount, intVal);
                                                if (!IsFailed(r))
@@ -794,7 +870,6 @@ HistoryPresentationModel::CreateHistoryList(int historyCount, ArrayList& history
                                                                pHistory->SetVisitedCount(intVal);
 
                                                        }
-
                                                }
                                                break;
 
@@ -913,57 +988,49 @@ HistoryPresentationModel::GetSearchHistoryCount(int& historyCount, String& text)
 result
 HistoryPresentationModel::GetHistoryWithTimeRange(Tizen::Base::DateTime& startTime, Tizen::Base::DateTime& endTime,const int startIndex,const int limit, ArrayList& pHistoryList)
 {
-       int count = -1;
-       String query;
-       String historyTable(HISTORY_DATA_TABLE);
-       result r = E_FAILURE;
-
-       query.Append(L"SELECT ");
-       //query.Append(historyTable);
-       query.Append(L"* ");
-       query.Append(L"FROM ");
-       query.Append(historyTable);
-       query.Append(" WHERE ");
-       //query.Append(historyTable);
-       query.Append(L"VISITDATE >= ");
-       query.Append("DateTime(");
-       query.Append("'");
-       query.Append(GetStringFromDate(startTime));
-       query.Append("')");
-       query.Append(" AND ");
-       //query.Append(historyTable);
-       query.Append(L"VISITDATE <= ");
-       query.Append("DateTime(");
-       query.Append("'");
-       query.Append(GetStringFromDate(endTime));
-       query.Append("')");
-       query.Append(" ORDER BY VISITDATE DESC");
-
-       //Append LIMIT
-       if (limit > 0)
+       int count = 0;
+       result r = E_SUCCESS;
+       if(__pDataList == null)
        {
-               query.Append(" LIMIT ");
-               query.Append(limit);
+               __pDataList = new(std::nothrow) ArrayList();
+               __pDataList->Construct();
 
-               //Append OFFESET
-               if (startIndex >= 0)
+               r = GetHistoryCount(count);
+               if(IsFailed(r))
                {
-                       query.Append(" OFFSET ");
-                       query.Append(startIndex);
+                       return r;
+               }
+               if(count > 0)
+               {
+                       r = GetHistory(0, count, *__pDataList);
+                       if(IsFailed(r))
+                       {
+                               return r;
+                       }
                }
        }
-
-       r = HistoryPresentationModel::ExecuteQuery(query, count);
-       AppLog("the count is %d",count);
-       TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::GetHistoryWithTimeRange query failed %s",GetErrorMessage(r));
-
-       r = CreateHistoryList(count, pHistoryList);
-       if (IsFailed(r))
+       else
        {
-               AppLogDebug("Error:CreateNoteList:failed:%s", GetErrorMessage(r));
+               count = __pDataList->GetCount();
        }
-
-       CATCH: return r;
+       int itemsFoundIndex = -1;
+       for (int counter = 0 ; counter < count; counter++)
+       {
+               History *pHistory = dynamic_cast<History*>(__pDataList->GetAt(counter));
+               if(pHistory != null && pHistory->GetVisitedTime().CompareTo(startTime) > 0 && pHistory->GetVisitedTime().CompareTo(endTime) < 0)
+               {
+                       itemsFoundIndex++;
+                       if(itemsFoundIndex >= startIndex && itemsFoundIndex < (limit + startIndex))
+                       {
+                               pHistoryList.Add(*pHistory);
+                       }
+                       else if(itemsFoundIndex > (limit + startIndex))
+                       {
+                               break;
+                       }
+               }
+       }
+       return r;
 }
 
 result
index 643faea..74d4079 100644 (file)
@@ -277,6 +277,26 @@ MainForm::OnInitializing(void)
                delete pBitmapPressed;
        }
 
+       __pItemContextLandscape= new(std::nothrow) ListContextItem();
+       __pItemContextLandscape->Construct();
+       pBitmapNormal = CommonUtil::GetNinepatchedBitmapN(L"00_button_sweep_delete.9.png", WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE,HEIGHT_CONTEXT_MENU_BUTTON);
+       pBitmapPressed = CommonUtil::GetNinepatchedBitmapN(L"00_button_sweep_delete_press.9.png", WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE, HEIGHT_CONTEXT_MENU_BUTTON);
+
+       if (pBitmapNormal != null && pBitmapPressed != null)
+       {
+               __pItemContextLandscape->AddElement(IDA_CONTEXT_ITEM_DELETE, CommonUtil::GetString(L"IDS_BR_SK_DELETE_ABB"), *pBitmapNormal, *pBitmapPressed, pBitmapPressed);
+       }
+
+       if (pBitmapNormal != null)
+       {
+               delete pBitmapNormal;
+       }
+
+       if (pBitmapPressed != null)
+       {
+               delete pBitmapPressed;
+       }
+
        return E_SUCCESS;
 }
 
@@ -786,8 +806,6 @@ MainForm::InitContextMenu(Point& p)
                __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY"), IDA_PRIVATEON_CLICKED,*pBitmap);
                delete pBitmap;
        }
-       r = __pMenu->AddItem(L"Desktop view"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_DESKTOP_VIEW_CLICKED);
-       r = __pMenu->AddItem(L"Saved Pages"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_SAVED_PAGES_CLICKED);
        r = __pMenu->AddItem(L"History"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_HISTORY_CLICKED);
        r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_BRIGHTNESS"), IDA_BRIGHTNESS_BTN_CLICKED);
        r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_SETTINGS_CLICKED);
@@ -1057,17 +1075,14 @@ MainForm::CreateItem (int index, int itemWidth)
                return NULL;
        }
 
-       if (pHistory->GetFaviconId().GetLength() > 0)
-       {
-               String bitmapId = pHistory->GetFaviconId();
-               Bitmap* pBitmap = FaviconManager::GetInstance()->GetFaviconN(bitmapId);
 
-               if ( pBitmap != NULL)
-               {
-                       pListIconImage = new Bitmap();
-                       pListIconImage->Construct(*pBitmap,Rectangle(0,0,pBitmap->GetWidth(),pBitmap->GetHeight()));
-                       delete pBitmap;
-               }
+       Bitmap* pBitmap = pHistory->GetFavIconBitmap();
+
+       if ( pBitmap != NULL)
+       {
+               pListIconImage = new Bitmap();
+               pListIconImage->Construct(*pBitmap,Rectangle(0,0,pBitmap->GetWidth(),pBitmap->GetHeight()));
+               delete pBitmap;
        }
 
        if(pListIconImage == null)
@@ -1105,11 +1120,24 @@ MainForm::CreateItem (int index, int itemWidth)
        }
 
 
-       if ( __pItemContext!= NULL)
+       if(GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT || GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE)
        {
-               if (pItem != null)
+               if ( __pItemContext!= NULL)
+               {
+                       if (pItem != null)
+                       {
+                               pItem->SetContextItem(__pItemContext);
+                       }
+               }
+       }
+       else
+       {
+               if ( __pItemContextLandscape!= NULL)
                {
-                       pItem->SetContextItem(__pItemContext);
+                       if (pItem != null)
+                       {
+                               pItem->SetContextItem(__pItemContextLandscape);
+                       }
                }
        }
        if( pListIconImage != NULL)
@@ -1178,6 +1206,10 @@ MainForm::OnTerminating(void)
        {
                delete __pItemContext;
        }
+       if(__pItemContextLandscape)
+       {
+               delete __pItemContextLandscape;
+       }
        return r;
 }
 
@@ -1374,13 +1406,18 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                pBookmark->SetBookmarkTitle(title);
                                pBookmark->SetUrl(url);
+                               if (__pWebViewer != null && __pWebViewer->GetFaviconN() != null)
+                               {
+                                       pBookmark->SetFavIconBitmap(*(__pWebViewer->GetFaviconN()));
+                               }
                                String id = FaviconManager::GetInstance()->SaveFavicon(*__pWindowInfo->pFavicon, __pWindowInfo->faviconUrl);
                                pBookmark->SetFaviconId(id);
-                               r = BookmarkPresentationModel::GetInstance()->SaveBookmark(*pBookmark);
+                               //r = BookmarkPresentationModel::GetInstance()->SaveBookmark(*pBookmark);
+                               r = BookmarkPresentationModel::GetInstance()->SaveTempBookmark(*pBookmark);
                                delete pBookmark;
 
                                NotificationPanel* pNotification = new (std::nothrow) NotificationPanel(*this);
-                               if(pNotification != null)
+                               if (pNotification != null)
                                {
                                        pNotification->SetText(message);
                                        pNotification->SetPositionDiff(__pFooterPanel->GetHeight());
@@ -1486,7 +1523,6 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED);
                                __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);
                                __pMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
-                               __pMenu->InsertItemAt(7,L"Save"/*CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB")*/, IDA_SAVE_CLICKED);
                                __pMenu->SetMaxVisibleItemsCount(6);
                        }
                        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
@@ -1795,7 +1831,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        __webControlPosition.y = __pAddressbar->GetHeight() - 12;
                        __pAddressbar->SetBounds(0,__adressPanelPosition.y,GetClientAreaBounds().width,__pAddressbar->GetHeight());
                        __pAddressbar->Invalidate(true);
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width,__webControlHeight));
+                       __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);
                }
 
@@ -2019,7 +2061,7 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        InitAddressbar();
 
        // hiding the address bar
-       __pAddressbar->SetBounds(__pAddressbar->GetX(), __pAddressbar->GetY() - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+//     __pAddressbar->SetBounds(__pAddressbar->GetX(), __pAddressbar->GetY() - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
        __pAddressbar->SetShowState(false);
        if(__pWebViewer != null)
        {
@@ -2286,6 +2328,16 @@ MainForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 }
 
 void
+MainForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+       if(__pAddressbar != null)
+       {
+               OnAddressBarKeypadClosed(*__pAddressbar, false);
+       }
+}
+
+
+void
 MainForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
        if (__pAddressbar != null)
@@ -2304,6 +2356,7 @@ MainForm::OnLoadingErrorOccurred(LoadingErrorType error,
 void
 MainForm::OnLoadingCompleted(void)
 {
+       AppLog("MainForm::OnLoadingCompleted start");
        DateTime date;
        result r = E_SUCCESS;
 
@@ -2357,10 +2410,25 @@ MainForm::OnLoadingCompleted(void)
                        AppLogDebug("MainForm::OnLoadingCompleted pageUrl = %ls", __pWindowInfo->pageUrl.GetPointer());
                }
                pHistory->SetVisitedTime(date);
-               String id = "";
+               /*String id = "";
                if(__pWindowInfo)
                        id = FaviconManager::GetInstance()->SaveFavicon(*__pWindowInfo->pFavicon, __pWindowInfo->faviconUrl);
-               pHistory->SetFaviconId(id);
+               pHistory->SetFaviconId(id);*/
+
+               if (__pWebViewer != null)
+               {
+                       AppLog("MainForm::OnLoadingCompleted setting the fav icon 0");
+
+                       Bitmap* pTempBitmap = __pWebViewer->GetFaviconN();
+                       if (pTempBitmap != null)
+                       {
+                               AppLog("MainForm::OnLoadingCompleted setting the fav icon 1");
+                               pHistory->SetFavIconBitmap(*pTempBitmap);
+                       }
+
+                       AppLog("MainForm::OnLoadingCompleted setting the fav icon 2");
+               }
+
                Canvas* pCanvas = __pWebViewer->GetCanvasN();
                Bitmap* pBitmap = new(std::nothrow) Bitmap();
                if ( pCanvas != null &&  pCanvas != null && pBitmap != null)
@@ -2369,7 +2437,14 @@ MainForm::OnLoadingCompleted(void)
                        pBitmap->Scale(Dimension(pBitmap->GetWidth()/4, pBitmap->GetHeight()/4));
                        pHistory->SetThumbnail(pBitmap);
                }
-               HistoryPresentationModel::GetInstance()->SaveHistory(*pHistory);
+               Bitmap *pFavIcon = __pWebViewer->GetFaviconN();
+               if(pFavIcon)
+               {
+                       pHistory->SetFavIconBitmap(*pFavIcon);
+                       delete pFavIcon;
+               }
+
+               HistoryPresentationModel::GetInstance()->SaveTempHistory(*pHistory);
                delete pHistory;
        }
        else
@@ -2381,6 +2456,7 @@ MainForm::OnLoadingCompleted(void)
                // temperary fixed (webpage can be not loaded)
                UpdateFavicon();
        }
+       AppLog("MainForm::OnLoadingCompleted done");
 }
 
 void
@@ -2394,6 +2470,20 @@ MainForm::OnEstimatedProgress(int progress)
        UpdateProgress(progress);
 }
 
+void MainForm::OnFaviconReceived(const Tizen::Graphics::Bitmap& favicon)
+{
+       AppLog("MainForm::OnFaviconReceived");
+       Bitmap* pFavIconBitmap = __pWebViewer->GetFaviconN();
+
+       if (pFavIconBitmap != null)
+       {
+               pFavIconBitmap->GetWidth();
+               pFavIconBitmap->GetHeight();
+               AppLog("MainForm::OnFaviconReceived width = %d",pFavIconBitmap->GetWidth());
+               AppLog("MainForm::OnFaviconReceived height = %d",pFavIconBitmap->GetHeight());
+       }
+}
+
 void
 MainForm::OnUrlSubmitted(Addressbar& addBar)
 {
@@ -2410,6 +2500,8 @@ MainForm::OnUrlSubmitted(Addressbar& addBar)
 void
 MainForm::LoadUrl(String& url)
 {
+       String encodedUrl;
+       UrlEncoder::Encode(url, L"UTF-8", encodedUrl);
        AppLogDebug("MainForm::LoadUrl enter");
 
        if (__pWebViewer != null)
@@ -2418,7 +2510,7 @@ MainForm::LoadUrl(String& url)
                __pWebViewer->Invalidate(true);
        }
 
-       if (url.CompareTo(L"") == 0)
+       if (encodedUrl.CompareTo(L"") == 0)
        {
                return;
        }
@@ -2442,17 +2534,17 @@ MainForm::LoadUrl(String& url)
        secondRegex.Construct(secondPattern, REGEX_CASELESS);
 
        // Match
-       ret = firstRegex.Match(url, false); // This returns true value
-       flag = secondRegex.Match(url, false);  // Checks whether URL typed is of type  abc.com (i.e without protocol in front of it)
+       ret = firstRegex.Match(encodedUrl, false); // This returns true value
+       flag = secondRegex.Match(encodedUrl, false);  // Checks whether URL typed is of type  abc.com (i.e without protocol in front of it)
 
        if (ret == true && __pWebViewer != null)
        {
-               __pWebViewer->LoadUrl(url);
+               __pWebViewer->LoadUrl(encodedUrl);
        }
        else if(__pWebViewer != null)
        {
                String tempUrl = L"http://";
-               tempUrl.Append(url);
+               tempUrl.Append(encodedUrl);
 
                if (flag == true)
                {
@@ -2460,7 +2552,7 @@ MainForm::LoadUrl(String& url)
                }
                else
                {
-                       __pWebViewer->LoadUrl(SettingPresentationModel::GetInstance()->GetSearchUrl(url));
+                       __pWebViewer->LoadUrl(SettingPresentationModel::GetInstance()->GetSearchUrl(encodedUrl));
                }
        }
        if (__pAddressbar != null)
@@ -2699,7 +2791,7 @@ MainForm::OnAddressBarModeChanged(/*const Addressbar& addBar*/)
 }
 
 void
-MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar)
+MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar, bool footerState)
 {
 
        if(__pFooterPanel != null)
@@ -2709,7 +2801,7 @@ MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar)
                {
                        InitMostVisitedSitesView(GetOrientationStatus());
                }
-               __pFooterPanel->SetShowState(true);
+               __pFooterPanel->SetShowState(footerState);
                __pFooterPanel->Invalidate(false);
        }
 
@@ -3011,60 +3103,62 @@ void
 MainForm::OnWebPageBlockSelected(Tizen::Web::Controls::Web& source, Tizen::Graphics::Point& startPoint, Tizen::Graphics::Point& endPoint)
 {
        AppLog("MainForm::OnWebPageBlockSelected");
-
        if (__pHitElementResult != null)
-       {
-               delete __pHitElementResult;
-               __pHitElementResult = null;
-       }
-
-       if (__pWebViewer != null)
-       {
-               AppLog("MainForm::OnWebPageBlockSelected web not null");
-               __pHitElementResult = __pWebViewer->GetElementByPointN(startPoint);
-       }
-
-       if (__pHitElementResult == null)
-       {
-               return;
-       }
-
-       if (__pHitElementResult->HasImage() != true)
-       {
-               String tagName = __pHitElementResult->GetTagName();
-               String type = __pHitElementResult->GetAttributeValue("type");
-
-               __currentSelectedStr.Clear();
-               __currentSelectedStr = __pWebViewer->GetTextFromBlock();
+               {
+                       delete __pHitElementResult;
+                       __pHitElementResult = null;
+               }
 
-               if ((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0)
+               if (__pWebViewer != null)
                {
-                       AppLog("MainForm::OnWebPageBlockSelected show paste option");
+                       AppLog("MainForm::OnWebPageBlockSelected web not null");
+                       __pHitElementResult = __pWebViewer->GetElementByPointN(endPoint);
+               }
 
-                       InitSelectTextContextMenu(startPoint,true);
-                       __pImageMenu->SetShowState(true);
-                       __pImageMenu->Show();
-                       __pImageMenu->Invalidate(true);
+               if (__pHitElementResult == null)
+               {
+                       return;
                }
-               else if (__pHitElementResult->HasUrl() == true || __currentSelectedStr.GetLength() > 0)
+
+               if (__pHitElementResult->HasImage() != true)
                {
-                       AppLog("MainForm::OnWebPageBlockSelected no paste option");
+                       String tagName = __pHitElementResult->GetTagName();
+                       String type = __pHitElementResult->GetAttributeValue("type");
+
+                       __currentSelectedStr.Clear();
+                       AppLog("__currentSelectedStr after clear %ls",__currentSelectedStr.GetPointer());
+                       __currentSelectedStr = __pWebViewer->GetTextFromBlock();
+                       AppLog("__currentSelectedStr after GetTextFromBlock %ls",__currentSelectedStr.GetPointer());
 
-                       if(__pHitElementResult->GetUrl().GetLength() > 0)
+                       if ((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0)
                        {
-                               __currentSelectedStr.Clear();
-                               __currentSelectedStr = __pHitElementResult->GetUrl();
+                               AppLog("MainForm::OnWebPageBlockSelected show paste option");
+
+                               InitSelectTextContextMenu(endPoint,true);
+                               __pImageMenu->SetShowState(true);
+                               __pImageMenu->Show();
+                               __pImageMenu->Invalidate(true);
                        }
-                       InitSelectTextContextMenu(startPoint,false);
-                       __pImageMenu->SetShowState(true);
-                       __pImageMenu->Show();
-                       __pImageMenu->Invalidate(true);
+                       else /*if (__pHitElementResult->HasUrl() == true )*/
+                       {
+                               AppLog("MainForm::OnWebPageBlockSelected no paste option");
+
+                               if(__pHitElementResult->GetUrl().GetLength() > 0)
+                               {
+                                       __currentSelectedStr.Clear();
+                                       __currentSelectedStr = __pHitElementResult->GetUrl();
+                               }
+                               InitSelectTextContextMenu(endPoint,false);
+                               __pImageMenu->SetShowState(true);
+                               __pImageMenu->Show();
+                               __pImageMenu->Invalidate(true);
+                       }
+
+                       AppLog("MainForm::OnWebPageBlockSelected block text is %ls",__currentSelectedStr.GetPointer());
+                       AppLog("MainForm::OnWebPageBlockSelected tag name is %ls",tagName.GetPointer());
+                       AppLog("MainForm::OnWebPageBlockSelected type name is %ls",type.GetPointer());
                }
 
-               AppLog("MainForm::OnWebPageBlockSelected block text is %ls",__currentSelectedStr.GetPointer());
-               AppLog("MainForm::OnWebPageBlockSelected tag name is %ls",tagName.GetPointer());
-               AppLog("MainForm::OnWebPageBlockSelected type name is %ls",type.GetPointer());
-       }
 }
 
 void
@@ -3200,7 +3294,7 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
        AppLog("MainForm::OnTextFound totalCount %d",totalCount);
        AppLog("MainForm::OnTextFound currentOrdinal %d",currentOrdinal);
 
-/*     if(totalCount == -1 || totalCount == 0)
+       if(totalCount == -1 || totalCount == 0)
        {
                __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),4,__pFindWordCountLabel->GetHeight());
                __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),214+80,__pFindWordEditField->GetHeight());
@@ -3211,7 +3305,7 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
                __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),174,__pFindWordEditField->GetHeight());
        }
-*/
+
        __maxOccurrances = totalCount;
        __currentWordIndex = currentOrdinal;
 
@@ -3308,7 +3402,7 @@ void
 MainForm::OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source)
 {
        AppLog("MainForm::OnWebKeypadWillOpen");
-       OnAddressBarKeypadOpened(*__pAddressbar);
+//     OnAddressBarKeypadOpened(*__pAddressbar);
 }
 
 void
@@ -3318,12 +3412,10 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
        if (__pWebViewer != null && __pFooterPanel != null)
        {
                AppLog("MainForm::OnOrientationChanged GetClientAreaBounds().height %d ", GetClientAreaBounds().height);
-               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
 
-               if (__pFooterPanel->GetShowState() == false)
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height));
-               else
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
+//             __pFooterPanel->SetShowState(false);
+               __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height));
+
 
                //__pWebViewer->SetBounds(Rectangle(0, 82, GetClientAreaBounds().width,webControlHeight));
        }
@@ -3455,6 +3547,8 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                }
                __pWebViewer->SetBlockSelectionPosition(currentPosition);
 
+
+
        }
        __inputEventToBeSupressed = true;
 }
@@ -3479,46 +3573,28 @@ MainForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphic
 void
 MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
-        int widthContextItem = 0;
-
-        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
-        {
-
-                widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE;
-        }
-        else
-        {
-                widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_PORTRAIT;
-        }
+       AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height);
+       int widthContextItem = 0;
 
-       if( __pItemContext != NULL)
+       Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight());
+       if (pBitmap != null && __pFooterLabel != null)
        {
-               delete __pItemContext;
-               __pItemContext = null;
-
+               __pFooterLabel->SetBackgroundBitmap(*pBitmap);
+               delete pBitmap;
        }
 
-       __pItemContext= new(std::nothrow) ListContextItem();
-       __pItemContext->Construct();
-       Bitmap* pBitmapNormal = CommonUtil::GetNinepatchedBitmapN(L"00_button_sweep_delete.9.png", widthContextItem,HEIGHT_CONTEXT_MENU_BUTTON);
-       Bitmap* pBitmapPressed = CommonUtil::GetNinepatchedBitmapN(L"00_button_sweep_delete_press.9.png", widthContextItem, HEIGHT_CONTEXT_MENU_BUTTON);
-
-       if (pBitmapNormal != null && pBitmapPressed != null)
+       if(__pMenu != null)
+               __pMenu->SetShowState(false);
+       if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
        {
-               __pItemContext->AddElement(IDA_CONTEXT_ITEM_DELETE, CommonUtil::GetString(L"IDS_BR_SK_DELETE_ABB"), *pBitmapNormal, *pBitmapPressed, pBitmapPressed);
-       }
 
-       if (pBitmapNormal != null)
-       {
-               delete pBitmapNormal;
+               widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE;
        }
-
-       if (pBitmapPressed != null)
+       else
        {
-               delete pBitmapPressed;
+               widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_PORTRAIT;
        }
 
-
        if (__pFindWordPanel != null && __pFindWordPanel->GetShowState() == true)
        {
                __pFindWordPanel->SetBounds(0,0,GetClientAreaBounds().width,__pFindWordPanel->GetHeight());
@@ -3854,6 +3930,8 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
 void
 MainForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
+       __pWebViewer->ReleaseBlock();
+       __currentWordIndex = 0;
        AppLog("Start MainForm::OnTouchMoved MoveUiControls");
        if(__pFindWordPanel)
        {
@@ -4055,7 +4133,7 @@ MainForm::InitMostVisitedSitesView(Tizen::Ui::OrientationStatus orientationStatu
        __pMostVisitedListView = new(std::nothrow) ListView();
        if(__pFooterPanel->GetShowState() == false)
        {
-               r = __pMostVisitedListView->Construct(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight() , GetClientAreaBounds().width, GetClientAreaBounds().height),true,false);
+               r = __pMostVisitedListView->Construct(Tizen::Graphics::Rectangle(0,0 , GetClientAreaBounds().width, GetClientAreaBounds().height),true,false);
        }
        else
        {
@@ -4074,9 +4152,9 @@ MainForm::InitMostVisitedSitesView(Tizen::Ui::OrientationStatus orientationStatu
        AddControl(*__pMostVisitedListView);
        AppLog("__pMostVisitedSitesPanel addcontrol %s",GetErrorMessage(r));
        if(__pFooterPanel->GetShowState() == false)
-               __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, GetClientAreaBounds().height - __pAddressbar->GetHeight() + 14));
+               __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,0, GetClientAreaBounds().width, GetClientAreaBounds().height - __pAddressbar->GetHeight() + 14));
        else
-               __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
+               __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,0, GetClientAreaBounds().width, GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
 
        __pMostVisitedListView->UpdateList();
 
index a8778a4..9be9179 100644 (file)
@@ -64,6 +64,8 @@ NotificationPanel::SetText(Tizen::Base::String& message)
                return;
        }
        __pLabel->SetText(message);
+       __pLabel->SetTextConfig(32, LABEL_TEXT_STYLE_BOLD);
+       __pLabel->Invalidate(true);
 }
 
 void
index a1e20fe..c0fa1f4 100644 (file)
@@ -165,7 +165,7 @@ PresentationModelBase::CreateDBTables(BrowserDbTableTypes tableType)
                        query.Append(L"CREATE TABLE IF NOT EXISTS ");
                        query.Append(BOOKMARK_URL_TABLE);
                        //query.Append(L" ( ID INTEGER PRIMARY KEY AUTOINCREMENT, TITLE TEXT, URL TEXT, PARENT_BOOKMARK_ID INTEGER DEFAULT -1, CREATED_TIME DATETIME, MODIFIED_TIME DATETIME, ICON_PATH TEXT, FAVICON_ID INTEGER)");
-                       query.Append(L" ( ID INTEGER PRIMARY KEY AUTOINCREMENT, TYPE INTEGER, PARENT INTEGER DEFAULT -1, ADDRESS TEXT, TITLE TEXT, CREATIONDATE DATETIME, SEQUENCE INTEGER, UPDATEDATE DATETIME, VISITDATE DATETIME, EDITABLE INTEGER, ACCESSACCOUNT INTEGER, FAVICON BLOB, FAVICON_LENGTH, FAVICON_W INTEGER, FAVICON_H INTEGER, CREATED_DATE DATETIME, ACCOUNT_NAME TEXT, ACCOUNT_TYPE TEXT, THUMBNAIL BLOB, THUMBNAIL_LENGTH INTEGER, THUMBNAIL_W INTEGER, THUMBNAIL_H INTEGER, VERSION INTEGER, SYNC TEXT, TAG1 TEXT, TAG2 TEXT, TAG3 TEXT, TAG4 TEXT)");
+                       query.Append(L" ( ID INTEGER PRIMARY KEY AUTOINCREMENT, TYPE INTEGER, PARENT INTEGER DEFAULT -1, ADDRESS TEXT, TITLE TEXT, CREATIONDATE DATETIME, SEQUENCE INTEGER, UPDATEDATE DATETIME, VISITDATE DATETIME, EDITABLE INTEGER, ACCESSACCOUNT INTEGER, FAVICON BLOB, FAVICON_LENGTH INTEGER, FAVICON_W INTEGER, FAVICON_H INTEGER, CREATED_DATE DATETIME, ACCOUNT_NAME TEXT, ACCOUNT_TYPE TEXT, THUMBNAIL BLOB, THUMBNAIL_LENGTH INTEGER, THUMBNAIL_W INTEGER, THUMBNAIL_H INTEGER, VERSION INTEGER, SYNC TEXT, TAG1 TEXT, TAG2 TEXT, TAG3 TEXT, TAG4 TEXT)");
 
                        break;
                }
@@ -282,7 +282,7 @@ PresentationModelBase::DropDBTables(void)
 result
 PresentationModelBase::ExecuteQuery(const String& formatQuery, int& count)
 {
-       AppLogDebug("Query: %ls", formatQuery.GetPointer());
+       AppLogDebug("rahul Query: %ls", formatQuery.GetPointer());
 
        result r = E_FAILURE;
        String queryType;
@@ -367,6 +367,257 @@ PresentationModelBase::ExecuteQuery(const String& formatQuery, int& count)
 }
 
 result
+PresentationModelBase::ExecuteBookmarkQuery(const Tizen::Base::String& formatQuery, int& count, BookmarkData& bookmark)
+{
+       AppLogDebug("PresentationModelBase::ExecuteBookmarkQuery Query: %ls", formatQuery.GetPointer());
+
+       result r = E_FAILURE;
+       String queryType;
+
+       DateTime dt;
+       String bookmarkId;
+       String bookmarkTitle = bookmark.GetBookmarkTitle();
+       bookmarkTitle.Replace(L"'", L"''");
+       String bookmarkUrl = bookmark.GetUrl();
+       bookmarkUrl.Replace(L"'", L"''");
+
+       PresentationModelBase::GetCurrentDateTime(dt);
+
+       if (__pDataBase == null)
+       {
+               return E_INIT_FAILED;
+       }
+
+       if (__pDbEnum != null)
+       {
+               delete __pDbEnum;
+               __pDbEnum = null;
+       }
+
+       if (__pDbStatement != null)
+       {
+               delete __pDbStatement;
+               __pDbStatement = null;
+       }
+
+
+#if defined(FBK_DB_QUERY_LOG)
+       {
+               File file;
+               file.Construct(L"/Home/Query.txt", "a+", true);
+               file.Write(formatQuery);
+               file.Write(String("\r\n"));
+       }
+#endif
+
+       r = formatQuery.SubString(0, QUERY_TYPE_LENGTH, queryType);
+       if (r == E_SUCCESS)
+       {
+               if (queryType == "SELECT")
+               {
+                       __pDbEnum = __pDataBase->QueryN(formatQuery);
+                       r = GetLastResult();
+                       if (IsFailed(r))
+                       {
+                               AppLogException("Failed Database::QueryN(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                               return r;
+                       }
+                       count = 0;
+
+                       if (__pDbEnum != null)
+                       {
+                               while (__pDbEnum->MoveNext() == E_SUCCESS)
+                               {
+                                       count++;
+                               }
+                               __pDbEnum->Reset();
+                       }
+               }
+               else
+               {
+                       if (__isBeginTransaction == false && (queryType == L"INSERT" ))
+                       {
+                               r = __pDataBase->BeginTransaction();
+                               if (IsFailed(r))
+                               {
+                                       AppLogException("Failed Database::BeginTransaction() . (error: %s)", GetErrorMessage(r));
+                                       return r;
+                               }
+
+                               __isBeginTransaction = true;
+                               __pDbStatement = __pDataBase->CreateStatementN(formatQuery);
+                               __pDbStatement->BindInt(0,bookmark.GetBookmarkType());
+                               __pDbStatement->BindString(1,bookmark.GetParentId());
+                               __pDbStatement->BindString(2,bookmarkUrl);
+                               __pDbStatement->BindString(3,bookmarkTitle);
+                               __pDbStatement->BindString(4,dt.ToString());
+                               __pDbStatement->BindString(5,dt.ToString());
+
+                               if(bookmark.GetFavIconBuffer() != null)
+                               {
+                                       __pDbStatement->BindBlob(6,*(bookmark.GetFavIconBuffer()));
+                               }
+                               else
+                               {
+                                       ByteBuffer buff;
+                                       buff.Construct(10);
+                                       __pDbStatement->BindBlob(6,buff);
+                               }
+                               __pDbStatement->BindInt(7,bookmark.GetFavIconWidth());
+                               __pDbStatement->BindInt(8,bookmark.GetFavIconHeight());
+
+                               __pDataBase->ExecuteStatementN(*__pDbStatement);
+
+                               if (IsFailed(GetLastResult()))
+                               {
+                                       AppLog("PresentationModelBase::ExecuteBookmarkQuery Failed Database::ExecuteSql(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                                       return r;
+                               }
+                               else
+                               {
+                                       AppLog("PresentationModelBase::ExecuteBookmarkQuery success database");
+                               }
+                       }
+                       else if (__isBeginTransaction == false && (queryType == L"UPDATE" || queryType == L"DELETE"))
+                       {
+                               r = __pDataBase->ExecuteSql(formatQuery, false);
+                               if (IsFailed(r))
+                               {
+                                       AppLogException("Failed Database::ExecuteSql(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                                       return r;
+                               }
+                       }
+
+                       count = 0;
+               }
+       }
+
+       return r;
+}
+
+result
+PresentationModelBase::ExecuteHistoryQuery(const Tizen::Base::String& formatQuery, int& nRowCount, History& history)
+{
+
+       AppLogDebug("Query: %ls", formatQuery.GetPointer());
+
+       result r = E_FAILURE;
+       String queryType;
+       DateTime date;
+       int count;
+
+       String historyTitle = history.GetHistoryTitle();
+       historyTitle.Replace(L"'", L"''");
+
+       String historyUrl = history.GetHistoryUrl();
+       historyUrl.Replace(L"'", L"''");
+
+       GetCurrentDateTime(date);
+
+       if (__pDataBase == null)
+       {
+               return E_INIT_FAILED;
+       }
+
+       if (__pDbEnum != null)
+       {
+               delete __pDbEnum;
+               __pDbEnum = null;
+       }
+
+       if (__pDbStatement != null)
+       {
+               delete __pDbStatement;
+               __pDbStatement = null;
+       }
+
+       r = formatQuery.SubString(0, QUERY_TYPE_LENGTH, queryType);
+       if (r == E_SUCCESS)
+       {
+               if (queryType == "SELECT")
+               {
+                       __pDbEnum = __pDataBase->QueryN(formatQuery);
+                       r = GetLastResult();
+                       if (IsFailed(r))
+                       {
+                               AppLogException("Failed Database::QueryN(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                               return r;
+                       }
+                       count = 0;
+
+                       if (__pDbEnum != null)
+                       {
+                               while (__pDbEnum->MoveNext() == E_SUCCESS)
+                               {
+                                       count++;
+                               }
+                               __pDbEnum->Reset();
+                       }
+
+               }
+               else
+               {
+                       if (__isBeginTransaction == false && (queryType == L"INSERT"))
+                       {
+                               r = __pDataBase->BeginTransaction();
+                               if (IsFailed(r))
+                               {
+                                       AppLogException("Failed Database::BeginTransaction() . (error: %s)", GetErrorMessage(r));
+                                       return r;
+                               }
+
+                               __isBeginTransaction = true;
+                               __pDbStatement = __pDataBase->CreateStatementN(formatQuery);
+                               if(GetLastResult() != E_SUCCESS)
+                               {
+                                       AppLog("CreateStatementN error: %s", GetErrorMessage(GetLastResult()));
+                                       return GetLastResult();
+                               }
+                               __pDbStatement->BindString(0,historyUrl);
+                               __pDbStatement->BindString(1,historyTitle);
+                               __pDbStatement->BindDateTime(2, date);
+                               if(history.GetFavIconBuffer() != null)
+                               {
+                                       __pDbStatement->BindBlob(3,*(history.GetFavIconBuffer()));
+                               }
+                               else
+                               {
+                                       ByteBuffer buff;
+                                       buff.Construct(10);
+                                       __pDbStatement->BindBlob(3,buff);
+                               }
+                               __pDbStatement->BindInt(4,history.GetFavIconWidth());
+                               __pDbStatement->BindInt(5,history.GetFavIconHeight());
+
+                               __pDataBase->ExecuteStatementN(*__pDbStatement);
+
+                               if (IsFailed(GetLastResult()))
+                               {
+                                       AppLog("PresentationModelBase::ExecuteBookmarkQuery Failed Database::ExecuteSql(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                                       return r;
+                               }
+                               else
+                               {
+                                       AppLog("PresentationModelBase::ExecuteBookmarkQuery success database");
+                               }
+                       }
+                       else if(__isBeginTransaction == false && (queryType == L"UPDATE" || queryType == L"DELETE"))
+                       {
+                               r = __pDataBase->ExecuteSql(formatQuery, false);
+                               if (IsFailed(r))
+                               {
+                                       AppLogException("Failed Database::ExecuteSql(). (error: %s, query: %ls)", GetErrorMessage(r), formatQuery.GetPointer());
+                                       return r;
+                               }
+                       }
+                       count = 0;
+               }
+       }
+
+       return r;
+}
+
+result
 PresentationModelBase::DbIsNextRowPresent(bool& nextRowpresent)
 {
        result r = E_FAILURE;
@@ -521,6 +772,39 @@ PresentationModelBase::GetColumn(int index, double& doubleValue)
 }
 
 result
+PresentationModelBase::GetColumn(int index,Tizen::Base::ByteBuffer& favIconBuffer)
+{
+       result r = E_FAILURE;
+       DbColumnType columnType;
+
+       if (null == __pDataBase || null == __pDbEnum)
+       {
+               return E_OUT_OF_MEMORY;
+       }
+       // Find column type
+       columnType = __pDbEnum->GetColumnType(index);
+
+       //if column type is null then assign empty string and return
+       if (columnType == DB_COLUMNTYPE_NULL)
+       {
+               return E_SUCCESS;
+       }
+       favIconBuffer.Construct(__pDbEnum->GetColumnSize(index));
+       //Get String value
+       r = __pDbEnum->GetBlobAt(index, favIconBuffer);
+       AppLog("PresentationModelBase::GetColumn favicon result is %s", GetErrorMessage(r));
+
+
+       if (IsFailed(r))
+       {
+               AppLogDebug("GetDateTimeAt: Failed");
+               return r;
+       }
+
+       return r;
+}
+
+result
 PresentationModelBase::RollbackDb()
 {
        result r = E_FAILURE;