N_SE-41079, N_SE-4110, N_SE-41244, N_SE-41185, N_SE-41215, N_SE-41461, N_SE-41326

Change-Id: I8005f30e2cfc9cc1efb32eae330531e2f0d5a7f8

diff --git a/inc/IntAddressbar.h b/inc/IntAddressbar.h
index 18623e5..89820b7 100644 (file)
--- a/inc/IntAddressbar.h
+++ b/inc/IntAddressbar.h
@@ -172,6 +172,7 @@ class Addressbar
        Tizen::Base::String GetAddressbarURL();
 
        bool HasCurrentFocus(void);
+       void OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs);\r
   private:
        /**
         * @brief        Updates the progressbar Value.
@@ -213,6 +214,7 @@ class Addressbar
        Tizen::Ui::Controls::Label* __pToolBarLabel;
        Tizen::Ui::Controls::Label* __pAddressbarURLLabel;
        Tizen::Ui::Controls::Button* __pAddressBackBtn;
+       bool __isAppBackGround;\r
   };
 
 #endif /* _INT_ADDRESSBAR_H_ */

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index 626d2ec..239470b 100644 (file)
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -187,8 +187,8 @@ public:
 
        void SetJavascriptEnabled(void);
 
-       void OnFocusGained(const Tizen::Ui::Control& source);
-       void OnFocusLost(const Tizen::Ui::Control& source);
+       virtual void OnFocusGained(const Tizen::Ui::Control& source);
+       virtual void OnFocusLost(const Tizen::Ui::Control& source);
 
        // IListViewItemEventListener
        /**
@@ -287,7 +287,6 @@ private:
        void FindNextWord(bool next = true);
        result InitAddressbar(void);
        result InitFooter(void);
-       result InitContextMenu(Tizen::Graphics::Point& p);
        result InitOptionMenu(void);
        result InitFindWordPanel(void);
        result InitImageContextMenu(Tizen::Graphics::Point p);
@@ -359,7 +358,7 @@ private:
        Tizen::Ui::Controls::Panel* __pFooterPanel;
        Tizen::Web::Controls::HitElementResult* __pHitElementResult;
        Tizen::Ui::Controls::ContextMenu* __pImageMenu;
-       Tizen::Ui::Controls::ContextMenu* __pMenu;
+//     Tizen::Ui::Controls::ContextMenu* __pMenu;\r
 
        Tizen::Ui::Controls::OptionMenu* __pOptionMenu;
        Tizen::Ui::Controls::Button* __pMoreButton;

diff --git a/inc/IntSharePopup.h b/inc/IntSharePopup.h
index 0905fa0..68e9d99 100644 (file)
--- a/inc/IntSharePopup.h
+++ b/inc/IntSharePopup.h
@@ -26,6 +26,7 @@
 
 #include <FApp.h>
 #include <FBase.h>
+#include <FIo.h>
 #include <FUi.h>
 
 

diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
old mode 100644 (file)
new mode 100755 (executable)
index 21ce068..0919e02
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-       This XML file was automatically generated by UiBuilder - do not modify by hand.
--->
-<!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
-    <LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDL_ADD_BOOKMARK">
-        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
-    </Form>
-    <Header>
-        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="Add Bookmarks" titleTextColor=""/>
-        <itemSet>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>
-            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
-        </itemSet>
-    </Header>
-    <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">
-        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="true" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
-        <panelLayout height="1123.0" mode="Portrait" width="720.0"/>
-        <panelLayout height="563.0" mode="Landscape" width="1200.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1109.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="569.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0" y="0.0"/>
-    </ScrollPanel>
-    <Label id="IDC_LABEL2" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="243.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="20.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="258.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="20.0"/>
-    </Label>
-    <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="22.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="22.0"/>
-    </Label>
-    <EditField id="IDC_EDITFIELD1" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="64.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_LABEL3" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="70.0"/>
-    </EditField>
-    <Label id="IDC_LABEL8" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="140.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="150.0"/>
-    </Label>
-    <EditField id="IDC_EDITFIELD2" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_LABEL6" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="186.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="196.0"/>
-    </EditField>
-    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="144.0"/>
-        <layout bottomRelation="IDC_EDITFIELD2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="44.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="152.0"/>
-    </Label>
-    <Label id="IDC_LABEL4" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDC_LABEL2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD2" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="262.0"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="276.0"/>
-    </Label>
-    <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="265.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="260.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1248.0" x="16.0" y="293.0"/>
-    </ListView>
-    <Label id="IDC_LABEL7" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="20.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="38.0" y="20.0"/>
-    </Label>
-</Scene>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+\r
+<Scene Bversion="2.0.0.201306101756" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_ADD_BOOKMARK">\r
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>\r
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>\r
+    </Form>\r
+    <Header>\r
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="Add Bookmarks" titleTextColor=""/>\r
+        <itemSet>\r
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>\r
+            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>\r
+        </itemSet>\r
+    </Header>\r
+    <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">\r
+        <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"/>\r
+        <panelLayout height="1123.0" mode="Portrait" width="720.0"/>\r
+        <panelLayout height="563.0" mode="Landscape" width="1280.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1109.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="569.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>\r
+    </ScrollPanel>\r
+    <Label id="IDC_LABEL2" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="243.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="20.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="258.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="20.0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="22.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="22.0"/>\r
+    </Label>\r
+    <EditField id="IDC_EDITFIELD1" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="64.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_LABEL3" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="70.0"/>\r
+    </EditField>\r
+    <Label id="IDC_LABEL8" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="140.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="150.0"/>\r
+    </Label>\r
+    <EditField id="IDC_EDITFIELD2" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="186.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="196.0"/>\r
+    </EditField>\r
+    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="144.0"/>\r
+        <layout bottomRelation="IDC_EDITFIELD2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="44.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="152.0"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL4" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="IDC_LABEL2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD2" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="262.0"/>\r
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="276.0"/>\r
+    </Label>\r
+    <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="265.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="264.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1248.0" x="16.0" y="282.0"/>\r
+    </ListView>\r
+    <Label id="IDC_LABEL7" parent="IDC_SCROLLPANEL2">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="20.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="38.0" y="20.0"/>\r
+    </Label>\r
+</Scene>\r

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index f341684..d2cd781 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -44,7 +44,7 @@ using namespace Tizen::Ui::Scenes;
 
 static const int LIST_ITEM_HEIGHT = 112;
 static const int H_ITEM_HEIGHT = 112;
-static const int H_TITLE_ITEM_HEIGHT = 140;
+static const int H_TITLE_ITEM_HEIGHT = 150;\r
 static const wchar_t* IDB_LIST_LEFT_SIDE = L"ListLeftSide.png";
 
 const int AddBookmarkForm::IDA_CREATE_BOOKMARK_FOLDER = 101;
@@ -361,7 +361,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
                                AppLog("AddBookmarkForm::OnActionPerformed does url exist 2");
                                if ( exist  == true)
                                {
-                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_BOOKMARK_ALREADY_EXISTS");
+                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_ALREADY_EXISTS");\r
                                        CreateMessage(msg);
 
                                        AppLogDebug("Bookmark already exists");
@@ -633,8 +633,8 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
 
 
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, ITEM_BACKGROUND_COLOR_HIGHLIGHTED);\r
+               pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, ITEM_BACKGROUND_COLOR_HIGHLIGHTED);\r
                pItem->SetMainText(CommonUtil::GetString(L"IDS_BR_HEADER_FOLDER"));
                pItem->SetSubText(__folderName);
                pItem->Make();

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 3293c78..4bfdb7f 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -73,6 +73,7 @@ Addressbar::Addressbar(void)
        __isClipboardOpen = false;
        __isKeyboardConnected = false;
        __isKeyPadOpened = false;
+       __isAppBackGround = false;\r
 }
 
 Addressbar::~Addressbar(void)
@@ -623,6 +624,19 @@ void
 Addressbar::OnFocusGained(const Control& source)
 {
        AppLog("XYZ::Addressbar::OnFocusGained");
+       if(__pAddressbarUrlField && __isAppBackGround == false)\r
+       {\r
+               String removedHttpUrl = RemoveHttpTextFromDisplayURL();\r
+               if (removedHttpUrl.IsEmpty() == false)\r
+               {\r
+                       __pAddressbarUrlField->SetText(removedHttpUrl);\r
+               }\r
+               else\r
+               {\r
+                       __pAddressbarUrlField->SetText(__displayUrl);\r
+               }\r
+       }\r
+\r
        if(__pAddressbarUrlField != null)
        {
                __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
@@ -645,18 +659,7 @@ void
 Addressbar::OnFocusLost(const Tizen::Ui::Control& source)
 {
        AppLog("XYZ::Addressbar::OnFocusLost");
-       if(__pAddressbarUrlField)
-       {
-               String removedHttpUrl = RemoveHttpTextFromDisplayURL();
-               if (removedHttpUrl.IsEmpty() == false)
-               {
-                       __pAddressbarUrlField->SetText(removedHttpUrl);
-               }
-               else
-               {
-                       __pAddressbarUrlField->SetText(__displayUrl);
-               }
-       }
+\r
 //     __editTextUrl = L"";
        if(__pListener != null)
        {
@@ -705,4 +708,18 @@ bool
 Addressbar::HasCurrentFocus()
 {
        return __pAddressbarUrlField->HasFocus();
+}\r
+\r
+\r
+void\r
+Addressbar::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)\r
+{\r
+       if (requestId == BACK_GROUND_APP_EVENT)\r
+       {\r
+               __isAppBackGround = true;\r
+       }\r
+       else if(requestId == FORE_GROUND_APP_EVENT)\r
+       {\r
+               __isAppBackGround = false;\r
+       }\r
 }

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 741aa3e..a78af94 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -239,7 +239,7 @@ BookmarkListForm::OnInitializing(void)
                return E_FAILURE;
        }
 
-       r = __pSearchListView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height -72 - 30), true, false);
+       r = __pSearchListView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height -72), true, false);
        TryCatch( !IsFailed(r),,"BookmarkListForm::OnSearchBarModeChanged Update list failed %s",GetErrorMessage(r));
 
        __pSearchListView->SetBackgroundColor(GetBackgroundColor());

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index a53f67f..db4a3f8 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -319,7 +319,14 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                GetFooter()->SetItemEnabled(0,true);
                GetFooter()->Invalidate(true);
 
-               labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() ,__pListview->GetItemCount());
+               if(__pListview->GetItemCount() >1)
+               {
+                       labelString.Format(25, CommonUtil::GetString(L"IDS_BR_POP_PD_ITEMS_SELECTED").GetPointer() , __pListview->GetItemCount());
+               }
+               else
+               {
+                       labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __pListview->GetItemCount());
+               }
 
                __selectedItemCount = 0;
 
@@ -691,7 +698,16 @@ EditBookmarkListForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView&
                labelString.Append(__selectedItemCount);
                labelString.Append(L")");*/
 
-               labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedItemCount);
+               if(__selectedItemCount >1)
+               {
+                       labelString.Format(25, CommonUtil::GetString(L"IDS_BR_POP_PD_ITEMS_SELECTED").GetPointer() , __selectedItemCount);
+               }
+               else
+               {
+                       labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedItemCount);
+               }
+
+
 
                __pInfoLabel->SetText(labelString);
                __pInfoPanel->Draw();
@@ -813,7 +829,15 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
        labelString.Append(L"(");
        labelString.Append(__selectedItemCount);
        labelString.Append(L")");*/
-       labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedItemCount);
+
+       if(__selectedItemCount >1)
+       {
+               labelString.Format(25, CommonUtil::GetString(L"IDS_BR_POP_PD_ITEMS_SELECTED").GetPointer() , __selectedItemCount);
+       }
+       else
+       {
+               labelString.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedItemCount);
+       }
 
        __pInfoLabel->SetText(labelString);
 

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 7187e92..56d277a 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -154,7 +154,6 @@ MainForm::MainForm(void)
        __pWindowInfo = null;
        __pWebViewer = null;
        __pImageMenu = null;
-       __pMenu = null;
        __pOptionMenu = null;
        __pFindWordControl = null;
        __pFindWordPanelLeftToRight = null;
@@ -214,6 +213,7 @@ MainForm::MainForm(void)
        __isWebKeypadOpened = false;
        __fontSize = 44;
        __isHwKeySupported = false;
+\r
 }
 
 MainForm::~MainForm(void)
@@ -532,7 +532,7 @@ MainForm::InitWebControl()
                __pWebViewer->SetWebKeypadEventListener(this);
                __pWebViewer->SetFocus();
                __pWebViewer->AddTouchEventListener(*this);
-
+               __pWebViewer->AddFocusEventListener(*this);
                __pWebViewer->SetCookieEnabled(SettingPresentationModel::GetInstance()->IsCookiesEnabled());
                __pWebViewer->SetTextSearchListener(this);
        }
@@ -548,6 +548,7 @@ void
 MainForm::OnFocusGained(const Control& source)
 {
        AppLog("MainForm::OnFocusGained");
+       RelayoutControls(false);
 }
 
 void
@@ -789,57 +790,6 @@ MainForm::InitFooter(void)
 }
 
 result
-MainForm::InitContextMenu(Point& p)
-{
-       result r = E_SUCCESS;
-       bool isPrivateBrowsing = false;
-       Bitmap* pBitmap = null;
-
-       if (__pMenu != null)
-       {
-               __pMenu->SetAnchorPosition(p);
-               __pMenu->Invalidate(true);
-               return r;
-       }
-
-       __pMenu = new(std::nothrow) ContextMenu();
-       r = __pMenu->Construct(p, CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-       TryCatch(!IsFailed(r),,"Contextmenu creation failed with%s",GetErrorMessage(r));
-
-       isPrivateBrowsing = SettingPresentationModel::GetInstance()->GetPrivateOn();
-
-
-       if (isPrivateBrowsing == true)
-       {
-               pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_ON);
-       }
-       else
-       {
-               pBitmap  = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_OFF);
-       }
-
-       r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK"), IDA_BOOKMARKBTN_CLICKED);
-
-       if ( pBitmap != NULL)
-       {
-               __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"), IDA_PRIVATEON_CLICKED,*pBitmap);
-               delete pBitmap;
-       }
-       r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_TAB_HISTORY"), IDA_HISTORY_CLICKED);
-       r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_BRIGHTNESS"), IDA_BRIGHTNESS_BTN_CLICKED);
-       r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_SETTINGS_CLICKED);
-
-
-       __pMenu->SetMaxVisibleItemsCount(6);
-       __pMenu->SetShowState(false);
-       __pMenu->AddActionEventListener(*this);
-       SetControlAlwaysOnTop(*__pMenu, true);
-
-       CATCH:
-       return r;
-}
-
-result
 MainForm::InitOptionMenu()
 {
        result r = E_SUCCESS;
@@ -1513,16 +1463,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        __pWebViewer->GoForward();
                }
-               if(__isHwKeySupported == true)
-               {
-                       __pOptionMenu->SetShowState(false);
-                       __pOptionMenu->Invalidate(false);
-               }
-               else
-               {
-                       __pMenu->SetShowState(false);
-                       __pMenu->Invalidate(false);
-               }
+               __pOptionMenu->SetShowState(false);\r
+               __pOptionMenu->Invalidate(false);\r
                break;
 
        case IDA_FINDONPAGE_CLICKED:
@@ -1531,16 +1473,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __currentSearchStr.Clear();
 
                InitFindWordPanel();
-               if(__isHwKeySupported == true)
-               {
-                       __pOptionMenu->SetShowState(false);
-                       __pOptionMenu->Invalidate(false);
-               }
-               else
-               {
-                       __pMenu->SetShowState(false);
-                       __pMenu->Invalidate(false);
-               }
+               __pOptionMenu->SetShowState(false);\r
+               __pOptionMenu->Invalidate(false);\r
 
                ShowFindWordPanel(true);
 
@@ -1605,20 +1539,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                __pAddressbar->UpdateFaviconBitmap(true);
                        }
                }
-               if(__isHwKeySupported == true)
-               {
-                       itemIndex = __pOptionMenu->GetItemIndexFromActionId(IDA_PRIVATEON_CLICKED);
-                       r = __pOptionMenu->SetItemAt(itemIndex,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-                       AppLog("Result:: %s for index = %d", GetErrorMessage(r),itemIndex);
-                       __pOptionMenu->Invalidate(true);
-               }
-               else
-               {
-                       itemIndex = __pMenu->GetItemIndexFromActionId(IDA_PRIVATEON_CLICKED);
-                       r = __pMenu->SetItemAt(itemIndex,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-                       AppLog("Result:: %s for index = %d", GetErrorMessage(r),itemIndex);
-                       __pMenu->Invalidate(true);
-               }
+\r
+               itemIndex = __pOptionMenu->GetItemIndexFromActionId(IDA_PRIVATEON_CLICKED);\r
+               r = __pOptionMenu->SetItemAt(itemIndex,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);\r
+               AppLog("Result:: %s for index = %d", GetErrorMessage(r),itemIndex);\r
+               __pOptionMenu->Invalidate(true);\r
                if ( pBitmap != NULL )
                {
                        delete pBitmap;
@@ -1636,16 +1561,9 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        pArgList->Add(*__pWindowInfo);
                        SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_SETTINGS), pArgList);
                }
-               if(__isHwKeySupported)
-               {
-                       __pOptionMenu->SetShowState(false);
-                       __pOptionMenu->Invalidate(false);
-               }
-               else
-               {
-                       __pMenu->SetShowState(false);
-                       __pMenu->Invalidate(false);
-               }
+               __pOptionMenu->SetShowState(false);\r
+               __pOptionMenu->Invalidate(false);\r
+\r
                if (pArgList != null)
                {
                        delete pArgList;
@@ -1713,30 +1631,14 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_ON_TEMP);
                                }
                        }
-                       if(__isHwKeySupported == true)
+                       if (pBitmap != null)\r
                        {
-                               if (pBitmap != null)
-                               {
-                                       r = __pOptionMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
-                                       delete pBitmap;
-                               }
-                       }
-                       else
-                       {
-                               if (pBitmap != null)
-                               {
-                                       r = __pMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
-                                       delete pBitmap;
-                               }
-                       }
-                       if(__isHwKeySupported == true)
-                       {
-                               __pOptionMenu->Invalidate(true);
-                       }
-                       else
-                       {
-                               __pMenu->Invalidate(true);
+                               r = __pOptionMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);\r
+                               delete pBitmap;\r
                        }
+\r
+\r
+                       __pOptionMenu->Invalidate(true);\r
                }
 
        }
@@ -1840,13 +1742,10 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_MOREBTN_CLICKED:
        {
-               AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 1");
-               Point p = Point(__pMoreButton->GetX() + __pMoreButton->GetWidth() / 2, GetClientAreaBounds().y + GetClientAreaBounds().height - __pMoreButton->GetHeight());
-               AppLog("Anchot pos: %d %d", p.x, p.y);
-               InitContextMenu(p);
+               AppLog("IDA_MOREBTN_CLICKED");\r
+               InitOptionMenu();\r
                if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL && __pWebViewer->GetShowState() == true)
                {
-                       AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 2");
                        int bookmarkCount=0;
                        bool exist = false;
                        String url=L"";
@@ -1870,13 +1769,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 3");
 
-                       if (__pMenu->GetItemCount() == 9)
+                       if (__pOptionMenu->GetItemCount() == 9)\r
                        {
-                               r = __pMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
+                               r = __pOptionMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);\r
                        }
                        else
                        {
-                               r = __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
+                               r = __pOptionMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);\r
                        }
 
                        if (IsFailed(r))
@@ -1886,34 +1785,35 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return ;
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 4");
-                       if (__pMenu->GetItemCount() != 9)
+                       if (__pOptionMenu->GetItemCount() != 9)\r
                        {
-                               __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED);
-                               __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_BODY_PRINT"), IDA_PRINT_CLICKED);
-//                             __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED);
-                               __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);
-                               __pMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
-                               __pMenu->SetMaxVisibleItemsCount(6);
+                               __pOptionMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED);\r
+                               __pOptionMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_BODY_PRINT"), IDA_PRINT_CLICKED);\r
+       //                              __pOptionMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED);\r
+                               __pOptionMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);\r
+                               __pOptionMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);\r
+                               __pOptionMenu->SetMaxVisibleItemsCount(6);\r
                        }
                        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
                        {
                                AppLog(" Orientation landscape");
-                               __pMenu->SetMaxVisibleItemsCount(5);
+                               __pOptionMenu->SetMaxVisibleItemsCount(5);\r
                        }
                        else
                        {
                                AppLog(" Orientation potrait");
-                               __pMenu->SetMaxVisibleItemsCount(6);
+                               __pOptionMenu->SetMaxVisibleItemsCount(6);\r
                        }
 
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 5");
                        delete pBitmap;
                }
                AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED end");
-               __pMenu->SetShowState(true);
-               __pMenu->Invalidate(true);
-               __pMenu->Show();
-       }
+               __pOptionMenu->SetShowState(true);\r
+               __pOptionMenu->Invalidate(true);\r
+               __pOptionMenu->Show();\r
+\r
+}\r
        break;
        case IDA_HISTORY_CLICKED:
        {
@@ -2009,10 +1909,21 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __currentSearchStr = L"";
                __currentWordIndex = 0;
                __maxOccurrances = 0;
-               __pFindWordEditField->SetText(L"");
+
+               if (__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
+               {
+                       __pFindWordEditField->SetText(L"");
+                       __pFindWordCountLabel->SetText(L"0/0");
+               }
+               else if (__pFindWordPanelRightToLeft && __pFindWordPanelRightToLeft->GetShowState() == true)
+               {
+                       __pFindWordEditFieldRightToLeft->SetText(L"");
+                       __pFindWordCountLabelRightToLeft->SetText(L"0/0");
+               }
+
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
-               __pFindWordCountLabel->SetText(L"0/0");
+
                __pWebViewer->SearchText(L"aaaabbbbcccc",true);
                AppLog("akjshdasd 1");
                __pFooterPanel->SetShowState(true);
@@ -2021,7 +1932,15 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_FINDWORD_SEARCH_CLICKED:
        {
-               __currentSearchStr = __pFindWordEditField->GetText();
+               if (__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
+               {
+                       __currentSearchStr = __pFindWordEditField->GetText();
+               }
+               else if (__pFindWordPanelRightToLeft && __pFindWordPanelRightToLeft->GetShowState() == true)
+               {
+                       __currentSearchStr = __pFindWordEditFieldRightToLeft->GetText();
+               }
+
                if (__currentSearchStr.GetLength() > 0)
                {
                        StartWordSearch();
@@ -2080,19 +1999,20 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                AppLogDebug("IDA_COPY_IMAGE_CLICKED");
                ClipboardItem item;
                const Bitmap* pBitmap = null;
-               if (__pHitElementResult != null)
+               if (__pHitElementResult != null && __pHitElementResult->HasImage())\r
                {
                        pBitmap = __pHitElementResult->GetImage();
                }
 
                String resourcePath = App::GetInstance()->GetAppResourcePath();
-               item.Construct(CLIPBOARD_DATA_TYPE_IMAGE , *pBitmap);
-
+               r = item.Construct(CLIPBOARD_DATA_TYPE_IMAGE , *pBitmap);\r
+               AppLog("Platofrm construct failed result %s",GetErrorMessage(r));\r
                // copying the item to clipboard
                Clipboard* pClipboard = Clipboard::GetInstance();
                if (pClipboard != null)
                {
-                       pClipboard->CopyItem(item);
+                       r = pClipboard->CopyItem(item);\r
+                       AppLog("Platofrm copy failed result %s",GetErrorMessage(r));\r
                }
        }
        break;
@@ -2296,22 +2216,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __currentSearchStr.Clear();
                __currentSearchStr.Append(__currentSelectedStr);
                InitFindWordPanel();
-               __pFindWordEditField->SetText(__currentSearchStr);
-               if(__isHwKeySupported)
-               {
-                       if(__pOptionMenu != null)
-                       {
-                               __pOptionMenu->SetShowState(false);
-                               __pOptionMenu->Invalidate(false);
-                       }
-               }
-               else
+
+               if(__pOptionMenu != null)\r
                {
-                       if(__pMenu != null)
-                       {
-                               __pMenu->SetShowState(false);
-                               __pMenu->Invalidate(false);
-                       }
+                       __pOptionMenu->SetShowState(false);\r
+                       __pOptionMenu->Invalidate(false);\r
                }
 
                __adressPanelPosition.y = 0;
@@ -2329,7 +2238,17 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
 
                ShowFindWordPanel(true);
-               __pFindWordEditField->SetFocus();
+               if (__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
+               {
+                       __pFindWordEditField->SetText(__currentSearchStr);
+                       __pFindWordEditField->SetFocus();
+               }
+               else if(__pFindWordPanelRightToLeft && __pFindWordPanelRightToLeft->GetShowState() == true)
+               {
+                       __pFindWordEditFieldRightToLeft->SetText(__currentSearchStr);
+                       __pFindWordEditFieldRightToLeft->SetFocus();
+               }
+
                if (__currentSearchStr.GetLength() > 0)
                {
                        StartWordSearch();
@@ -2461,10 +2380,9 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                String url = __pFooterUrlField->GetText();
                AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
 //             LoadUrl(url);
-               __pWebViewer->Reload();
-               if (__pAddressbar != null)
+               if (__pWebViewer != null && __pAddressbar != null)
                {
-                       //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+                       __pWebViewer->Reload();
                        SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
                }
 
@@ -2759,30 +2677,15 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                }
        }
 
-       if(__isHwKeySupported == true)
+       if (__pOptionMenu != null && __pOptionMenu->GetItemCount() != 9)\r
        {
-               if (__pOptionMenu != null && __pOptionMenu->GetItemCount() == 3)
-               {
-                       __pOptionMenu->SetItemAt(0,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-               }
-               else if (__pOptionMenu != null )
-               {
-                       __pOptionMenu->SetItemAt(3,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-               }
-
+               __pOptionMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);\r
        }
-       else
+       else if (__pOptionMenu != null )\r
        {
-               if (__pMenu != null && __pMenu->GetItemCount() == 3)
-               {
-                       __pMenu->SetItemAt(0,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-               }
-               else if (__pMenu != null )
-               {
-                       __pMenu->SetItemAt(3,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);
-               }
-
+               __pOptionMenu->SetItemAt(5,CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY_AND_SECURITY_ABB"),IDA_PRIVATEON_CLICKED,*pBitmap);\r
        }
+\r
        if (pBitmap != null)
        {
                delete pBitmap;
@@ -2858,23 +2761,14 @@ MainForm::OnLoadingStarted(void)
        }
 
        // this is added in case if menu is opened and user load the page
-       if(__isHwKeySupported == true)
+       if(__pOptionMenu != null && __pOptionMenu->GetShowState() == true)\r
        {
-               if(__pOptionMenu != null && __pOptionMenu->GetShowState() == true)
-               {
-                       __pOptionMenu->SetShowState(false);
-                       __pOptionMenu->Invalidate(true);
-               }
-
-       }
-       else
-       {
-               if(__pMenu != null && __pMenu->GetShowState() == true)
-               {
-                       __pMenu->SetShowState(false);
-                       __pMenu->Invalidate(true);
-               }
+               __pOptionMenu->SetShowState(false);\r
+               __pOptionMenu->Invalidate(true);\r
        }
+\r
+\r
+\r
        if(__pImageMenu != null && __pImageMenu->GetShowState() == true)
        {
                __pImageMenu->SetShowState(false);
@@ -3486,7 +3380,7 @@ MainForm::OnAddressBarFocusLost(const Addressbar& addBar, bool addressbarKeyPadS
                        __pFooterPanel->SetShowState(true);
                }
 
-       RelayoutControls(false);
+       //RelayoutControls(false);
 }
 
 void
@@ -3904,8 +3798,14 @@ MainForm::RelayoutControls(bool showAddressbar,bool relayoutFooter)
        }
        if (__pWebViewer != null && __pWebViewer->GetShowState() == true)
        {
-               __pWebViewer->SetBounds(0, __webControlPosition.y, GetClientAreaBounds().width, __webControlHeight + 12);
-               __pWebViewer->Invalidate(false);
+               if(__pWebViewer->GetX() == 0 && __pWebViewer->GetY() == __webControlPosition.y &&__pWebViewer->GetWidth() == GetClientAreaBounds().width &&__pWebViewer->GetHeight() == __webControlHeight + 12 )\r
+               {\r
+               }\r
+               else\r
+               {\r
+                       __pWebViewer->SetBounds(0, __webControlPosition.y, GetClientAreaBounds().width, __webControlHeight + 12);\r
+                       __pWebViewer->Invalidate(false);\r
+               }\r
        }
        if(__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
        {
@@ -4244,7 +4144,11 @@ MainForm::OnWebKeypadClosed(Tizen::Web::Controls::Web& source)
 void
 MainForm::OnWebKeypadBoundsChanged(Tizen::Web::Controls::Web& source)
 {
-//     RelativeLayout(false);
+       //      RelativeLayout(false);\r
+       if(__pWebViewer != null)\r
+       {\r
+               __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width,GetClientAreaBounds().height));\r
+       }\r
 }
 
 void
@@ -4355,6 +4259,11 @@ MainForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphic
 {
        AppLog("MainForm::OnTouchReleased");
 
+       if (__pAddressbar && __pAddressbar->GetShowState() == true)
+       {
+               __pAddressbar->SetShowState(false);
+       }
+
        // Not reuired now.
        /*HitElementResult* pHitElement = __pWebViewer->GetElementByPointN(currentPosition);
        if(pHitElement != null && pHitElement->HasUrl() == true && __inputEventToBeSupressed == true)
@@ -4490,16 +4399,10 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
                }
        }
 
-       if(__isHwKeySupported == true)
-       {
-               if(__pOptionMenu != null)
-                       __pOptionMenu->SetShowState(false);
-       }
-       else
-       {
-               if(__pMenu != null)
-                       __pMenu->SetShowState(false);
-       }
+\r
+       if(__pOptionMenu != null)\r
+               __pOptionMenu->SetShowState(false);\r
+\r
        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
        {
                widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE;
@@ -4518,13 +4421,6 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
        }
        InitAddressbar();
 
-       if(__pMoreButton && __pMenu)
-       {
-               Point p = Point(__pMoreButton->GetX() + __pMoreButton->GetWidth() / 2, GetBounds().height - __pMoreButton->GetHeight());
-               __pMenu->SetAnchorPosition(p);
-               __pMenu->Invalidate(true);
-       }
-
        String homePage = SettingPresentationModel::GetInstance()->GetHomepage();
        if (homePage.CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0)
        {
@@ -4792,9 +4688,6 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
                AppLog("MainForm::OnTouchPressed %d",__pFindWordControl->GetShowState());
 //             ShowFindWordPanel(__pFindWordControl->GetShowState(), true);
        }
-       //__isLongPressedDone = false;
-       if(__pAddressbar)
-               __pAddressbar->SetShowState(false);
 
        Touch touch;
        IList* pList = null;
@@ -5412,13 +5305,18 @@ void MainForm::OnSharePopupControlStarted(void)
        __pWebViewer->AddTouchEventListener(*this);
 }
 
-void MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)
+void\r
+MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)\r
 {
        if (requestId == BACK_GROUND_APP_EVENT)
        {
                if(__pWebViewer != null)
                {
                        __pWebViewer->Pause();
+               }\r
+               if(__pAddressbar != null)\r
+               {\r
+                       __pAddressbar->SendUserEvent(BACK_GROUND_APP_EVENT,NULL);\r
                }
        }
        else if(requestId == FORE_GROUND_APP_EVENT)
@@ -5427,6 +5325,10 @@ void MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collectio
                {
                        __pWebViewer->Resume();
                }
+               if(__pAddressbar != null)\r
+               {\r
+                       __pAddressbar->SendUserEvent(FORE_GROUND_APP_EVENT,NULL);\r
+               }\r
        }
 }
 
@@ -5459,21 +5361,6 @@ void
 MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 {
        AppLog("MainForm::OnFormMenuRequested called");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
        InitOptionMenu();
        if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL && __pWebViewer->GetShowState() == true)
        {
@@ -5543,13 +5430,5 @@ MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
        __pOptionMenu->SetShowState(true);
        __pOptionMenu->Invalidate(true);
        __pOptionMenu->Show();
-
-
-
-
-
-
-
-
-
-}
+\r
+}
\ No newline at end of file

diff --git a/src/IntPresentationModelBase.cpp b/src/IntPresentationModelBase.cpp
index 25783e7..f2b95ec 100644 (file)
--- a/src/IntPresentationModelBase.cpp
+++ b/src/IntPresentationModelBase.cpp
@@ -996,7 +996,8 @@ PresentationModelBase::GetCurrentDateTime(DateTime& dt)
        result r = E_FAILURE;
        TimeZone tz;
 
-       r = SystemTime::GetCurrentTime(UTC_TIME, dtNow);
+       r = SystemTime::GetCurrentTime(dt);\r
+       return true;\r
        if (IsFailed(r))
        {
                return false;

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index a7294b8..b9e580c 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -387,12 +387,7 @@ SharePopup::StartEmailAppControl(void)
           delete pAc;
    }
 
-   if (pShareInfo != null)
-   {
-          delete pShareInfo;
-   }
    delete pDataList;
-
 }
 
 void
@@ -480,12 +475,6 @@ SharePopup::StartMessageAppControl(void)
                delete pAc;
        }
 
-
-
-       if (pShareInfo != null)
-       {
-               delete pShareInfo;
-       }
        if(pDataList)
        {
                delete pDataList;
@@ -502,6 +491,39 @@ SharePopup::OnAppControlCompleted(const Tizen::Base::String& providerId, const T
 void SharePopup::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
 {
        AppLog("SharePopup::OnAppControlCompleteResponseReceived");
+
+       ShareInfo* pShareInfo = null;
+       result r = E_FAILURE;
+
+       if (__pShareList != null)
+       {
+               pShareInfo = dynamic_cast<ShareInfo*>(__pShareList->GetAt(0));
+       }
+
+       String attachVal;
+       bool imageAttachment = false;
+       if (pShareInfo != null)
+       {
+               imageAttachment = pShareInfo->GetImageAttached();
+               if (imageAttachment)
+               {
+                       attachVal = pShareInfo->GetImagePath();
+                       AppLog("SharePopup:: imagePath is %S",attachVal.GetPointer());
+                       r = File::Remove(attachVal);
+                       if(r == E_SUCCESS)
+                       {
+                               AppLog("removed success");
+                       }
+                       else
+                       {
+                               AppLog("removed failure");
+                       }
+               }
+               if (pShareInfo != null)
+               {
+                       delete pShareInfo;
+               }
+       }
        Popup::SetShowState(false);
        Popup::Show();
        __appControlOngoing = false;