Fixed Nabi Issues and poppup alignment changes

Change-Id: I2e95a6e8697035fa02688aa0cd14574af1aaecd5
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/inc/IntInternetApp.h b/inc/IntInternetApp.h
index ab71cc9..2170198 100644 (file)
--- a/inc/IntInternetApp.h
+++ b/inc/IntInternetApp.h
@@ -34,6 +34,7 @@ class InternetApp
        : public Tizen::App::UiApp
        , public Tizen::App::IAppControlProviderEventListener
        , public Tizen::System::IScreenEventListener
+       , public Tizen::System::ISettingEventListener
 {
 public:
        /**
@@ -74,6 +75,9 @@ public:
 
        void OnScreenOn(void);
 
+       //ISettingEventListener
+       void OnSettingChanged(Tizen::Base::String& key);
+
        //IAppControlProviderEventListener
        void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String &operationId, const Tizen::Base::String *pDataType, const Tizen::Base::String *pUriScheme, const Tizen::Base::Collection::IMap *pArgs);
 private:

diff --git a/res/screen-size-normal/IDL_BOOKMARK_LIST.xml b/res/screen-size-normal/IDL_BOOKMARK_LIST.xml
index e8559c4..f67e442 100644 (file)
--- a/res/screen-size-normal/IDL_BOOKMARK_LIST.xml
+++ b/res/screen-size-normal/IDL_BOOKMARK_LIST.xml
@@ -3,33 +3,34 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201302151552" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304161803" Dversion="20120315">
     <LogicalCoordinate>480</LogicalCoordinate>
     <Form id="IDL_BOOKMARK_LIST">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
         <itemSet>
-            <footerItem actionId="105" disabledIconPath="" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create.png" pressedIconPath="" selectedIconPath="" text=""/>
-            <footerItem actionId="103" disabledIconPath="I01_controlbar_icon_compose_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_compose.png" pressedIconPath="" selectedIconPath="" text=""/>
-            <footerItem actionId="104" disabledIconPath="I01_controlbar_icon_create_folder_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create_folder.png" pressedIconPath="" selectedIconPath="" text=""/>
+            <footerItem accessibilityHint="" actionId="105" disabledIconPath="" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create.png" pressedIconPath="" selectedIconPath="" text=""/>
+            <footerItem accessibilityHint="" actionId="103" disabledIconPath="I01_controlbar_icon_compose_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_compose.png" pressedIconPath="" selectedIconPath="" text=""/>
+            <footerItem accessibilityHint="" actionId="104" disabledIconPath="I01_controlbar_icon_create_folder_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create_folder.png" pressedIconPath="" selectedIconPath="" text=""/>
         </itemSet>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TAB" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TAB" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <SearchBar id="IDC_SEARCHBAR1" parent="IDL_BOOKMARK_LIST">
-        <property backgroundBitmapPath="" buttonActionId="0" buttonText="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonTextColor="" disabledSearchFieldColor="" disabledSearchFieldTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" guideText="::IDS_BR_BODY_SEARCH" guideTextColor="" highlightedButtonColor="" highlightedButtonTextColor="" highlightedSearchFieldColor="" highlightedSearchFieldTextColor="" keypadAction="KEYPAD_ACTION_SEARCH" limitLength="500" lowerCaseMode="false" normalButtonColor="" normalButtonTextColor="" normalSearchFieldColor="" normalSearchFieldTextColor="" pressedButtonColor="" pressedButtonTextColor="" searchFieldTextSize="22" showSearchBarButton="true" text="" textPredictionEnabled="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="57" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="480" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="57" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BOOKMARK_LIST" 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="854" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" buttonActionId="0" buttonText="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonTextColor="" disabledSearchFieldColor="" disabledSearchFieldTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" guideText="::IDS_BR_BODY_SEARCH" guideTextColor="" highlightedButtonColor="" highlightedButtonTextColor="" highlightedSearchFieldColor="" highlightedSearchFieldTextColor="" keypadAction="KEYPAD_ACTION_SEARCH" limitLength="500" lowerCaseMode="false" normalButtonColor="" normalButtonTextColor="" normalSearchFieldColor="" normalSearchFieldTextColor="" pressedButtonColor="" pressedButtonTextColor="" searchFieldTextSize="22.0" showSearchBarButton="true" text="" textPredictionEnabled="false"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="57.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="480.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="57.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BOOKMARK_LIST" 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="854.0" x="0" y="0.0"/>
     </SearchBar>
     <ListView id="IDC_LISTVIEW1" parent="IDL_BOOKMARK_LIST">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="I01_Nocontents_Bookmarks.png" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList="::IDS_BR_BODY_NO_BOOKMARKS_DETAILS"/>
-        <layout bottomRelation="None" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="564" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="None" rightRelationType="" topRelation="None" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="480" x="0" y="57"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="272" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="854" x="0" y="50"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="I01_Nocontents_Bookmarks.png" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList="::IDS_BR_BODY_NO_BOOKMARKS_DETAILS"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="564.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="480.0" x="0.0" y="57.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="272.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="854.0" x="0.0" y="50.0"/>
     </ListView>
 </Scene>

diff --git a/res/screen-size-normal/IDL_CONFIRMATION_POPUP.xml b/res/screen-size-normal/IDL_CONFIRMATION_POPUP.xml
index 44739db..0d5d260 100644 (file)
--- a/res/screen-size-normal/IDL_CONFIRMATION_POPUP.xml
+++ b/res/screen-size-normal/IDL_CONFIRMATION_POPUP.xml
@@ -3,30 +3,25 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-<ScenePopup Bversion="2.0.0.201303280947" Dversion="20120315">
-    <Popup id="IDL_CONFIRMATION_POPUP">
+<ScenePopup Bversion="2.0.0.201304161803" Dversion="20120315">
+    <Popup id="IDL_POPUP_TWO_BUTTON">
         <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
-        <layout height="426.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="620.0"/>
-        <layout height="426.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="620.0"/>
+        <layout height="260.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688.0"/>
+        <layout height="260.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688.0"/>
     </Popup>
-    <Panel id="IDC_BOTTOM_PANEL" parent="IDL_CONFIRMATION_POPUP">
-        <property backgroundColor="#D2DCE6" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_CONFIRMATION_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONFIRMATION_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONFIRMATION_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="580.0" x="0.0" y="330.0"/>
-        <layout bottomRelation="IDL_CONFIRMATION_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONFIRMATION_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONFIRMATION_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="0.0" x="0" y="282.0"/>
-    </Panel>
-    <Button id="IDC_BOTTOM_BUTTON1" parent="IDC_BOTTOM_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#4A7087" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_SK_YES" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BOTTOM_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="247.0" x="20.0" y="12.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="247.0" x="12.0" y="12.0"/>
+    <Button id="IDC_BUTTON_OK" parent="IDL_POPUP_TWO_BUTTON">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="OK" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_POPUP_TWO_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_TWO_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="16.0" y="162.0"/>
+        <layout bottomRelation="IDL_POPUP_TWO_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_TWO_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="16.0" y="162.0"/>
     </Button>
-    <Button id="IDC_BOTTOM_BUTTON2" parent="IDC_BOTTOM_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#4A7087" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_SK_NO" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_BOTTOM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="247.0" x="313.0" y="12.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="12.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_BOTTOM_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="247.0" x="321.0" y="10.0"/>
+    <Button id="IDC_BUTTON_CANCEL" parent="IDL_POPUP_TWO_BUTTON">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_POPUP_TWO_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="24.0" marginLeft="20.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_POPUP_TWO_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="354.0" y="162.0"/>
+        <layout bottomRelation="IDL_POPUP_TWO_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_POPUP_TWO_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="354.0" y="162.0"/>
     </Button>
-    <Label id="IDC_CONFIRMATION_LABEL" parent="IDL_CONFIRMATION_POPUP">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="" textColor="" textSize="40.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BOTTOM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="330.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONFIRMATION_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="3.0" marginRight="3.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONFIRMATION_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONFIRMATION_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="574.0" x="0" y="0.0"/>
-        <layout bottomRelation="IDC_BOTTOM_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="282.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONFIRMATION_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONFIRMATION_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONFIRMATION_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="0.0" x="0" y="0.0"/>
+    <Label id="IDC_LABEL1" parent="IDL_POPUP_TWO_BUTTON">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="" textColor="" textSize="38.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="118.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_TWO_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Portrait" rightRelation="IDL_POPUP_TWO_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_POPUP_TWO_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="32.0"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="118.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_TWO_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Landscape" rightRelation="IDL_POPUP_TWO_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_POPUP_TWO_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="32.0"/>
     </Label>
 </ScenePopup>

diff --git a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
index 32b44e4..8ca2fd4 100644 (file)
--- a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
+++ b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
@@ -4,33 +4,33 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201303041025" Dversion="20120315">
+<Scene Bversion="2.0.0.201304161803" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CREATE_BOOKMARK_FOLDER">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet>
-            <buttonItem actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="left"/>
-            <buttonItem actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
+            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="left"/>
+            <buttonItem accessibilityHint="" actionId="102" 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>
     <Label id="IDC_LABEL1" parent="IDL_CREATE_BOOKMARK_FOLDER">
-        <property backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="20" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="128" 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="128" 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"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="20.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="128.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="128.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="1280.0" x="0.0" y="0.0"/>
     </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_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"/>
+        <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="" horizontalMargin="16.0" 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.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.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.0" x="0" y="48.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.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.0" x="0" y="48.0"/>
     </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_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"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" 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="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CREATE_BOOKMARK_FOLDER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CREATE_BOOKMARK_FOLDER" 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="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
     </Label>
 </Scene>

diff --git a/res/screen-size-normal/IDL_SHARE_POPUP.xml b/res/screen-size-normal/IDL_SHARE_POPUP.xml
index 61136f5..84252fe 100644 (file)
--- a/res/screen-size-normal/IDL_SHARE_POPUP.xml
+++ b/res/screen-size-normal/IDL_SHARE_POPUP.xml
@@ -3,20 +3,20 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-<ScenePopup Bversion="3.0.0.201212071727" Dversion="20120315">
-    <Popup id="IDL_SHARE_POPUP">
-        <property color="#FFFFFF" titleText="::IDS_BR_OPT_SHARE" titleTextColor=""/>
-        <layout height="464" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="642"/>
-        <layout height="460" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="620"/>
+<ScenePopup Bversion="2.0.0.201304161803" Dversion="20120315">
+    <Popup id="IDL_POPUP_LIST">
+        <property accessibilityHint="" color="" titleText="::IDS_BR_OPT_SHARE" titleTextColor=""/>
+        <layout height="350.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="680.0"/>
+        <layout height="350.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="680.0"/>
     </Popup>
-    <ListView id="IDC_POPUP_LIST" parent="IDL_SHARE_POPUP">
-        <property backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="224" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SHARE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_SHARE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="596" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="224" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SHARE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_SHARE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="0" x="0" y="0"/>
-    </ListView>
-    <Button id="IDC_BUTTON" parent="IDL_SHARE_POPUP">
-        <property 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="Close" 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="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="336" x="140" y="240"/>
-        <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="220" x="200" y="238"/>
+    <Button id="IDC_BUTTON1" parent="IDL_POPUP_LIST">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Close" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_POPUP_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="143.0" y="174.0"/>
+        <layout bottomRelation="IDL_POPUP_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="143.0" y="174.0"/>
     </Button>
+    <ListView id="IDC_LISTVIEW" parent="IDL_POPUP_LIST">
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
+        <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_POPUP_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="0" y="0.0"/>
+        <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="154.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_POPUP_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_POPUP_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_POPUP_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="0.0" y="0.0"/>
+    </ListView>
 </ScenePopup>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index c751021..d6daac2 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -963,7 +963,10 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                        BookmarkData* pBookmark = null;
                        BookmarkPresentationModel::GetInstance()->GetFolder(parentID, 0, __folderCount, folderList);
                        pBookmark = static_cast<BookmarkData*>(folderList.GetAt(__selectedIndex-2));
-                       __folderName = pBookmark->GetBookmarkTitle();
+                       if(pBookmark != null)
+                       {
+                               __folderName = pBookmark->GetBookmarkTitle();
+                       }
                }
        }
        if (__pEditFieldTitle != NULL)

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 7c0ecec..984db80 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -757,7 +757,7 @@ Addressbar::OrientationChanged( int& width)
        __pAddressBackBtn->SetBounds(width - __pAddressBackBtn->GetWidth() - 6,__pAddressBackBtn->GetY(),__pAddressBackBtn->GetWidth(),__pAddressBackBtn->GetHeight());
        __pStopBtn->SetBounds(__pBgPanel->GetWidth() - __pStopBtn->GetWidth(),__pStopBtn->GetY(),__pStopBtn->GetWidth(),__pStopBtn->GetHeight());
        __pClearBtn->SetBounds(__pBgPanel->GetWidth() - __pClearBtn->GetWidth() ,__pClearBtn->GetY(),__pClearBtn->GetWidth(),__pClearBtn->GetHeight());
-       __pAddressbarUrlField->SetBounds(__pToolBarLabel->GetWidth(),__pAddressbarUrlField->GetY(),__pBgPanel->GetWidth() - __pStopBtn->GetWidth()- __pToolBarLabel->GetWidth() ,__pAddressbarUrlField->GetHeight());
+//     __pAddressbarUrlField->SetBounds(__pToolBarLabel->GetWidth(),__pAddressbarUrlField->GetY(),__pBgPanel->GetWidth() - __pStopBtn->GetWidth()- __pToolBarLabel->GetWidth() ,__pAddressbarUrlField->GetHeight());
 
        Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pAddressbarBg->GetWidth(), __pAddressbarBg->GetHeight());
        if (pBitmap != null)
@@ -817,9 +817,10 @@ Addressbar::OnFocusGained(const Control& source)
 {
        //SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
        //      SetAddressbarMode(__prevAddMode);
-       __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
+
        if(__pAddressbarUrlField != null)
        {
+               __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
                if(__pAddressbarUrlField->GetTextLength() == 0)
                {
                        __pAddressbarUrlField->SetKeypadActionEnabled(false);

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 3d73740..8316545 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -583,7 +583,6 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
        {
                delete pItem;
                pItem = null;
-               delete pImage;
                return NULL;
        }
        if ( pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER )
@@ -1021,8 +1020,7 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
        else
        {
                __pSearchListView->SetShowState(true);
-//             __pSearchListView->SetEnabled(false);
-//             __pSearchListView->SetBackgroundColor(Color(248,246,239,100));
+               __pSearchListView->SetEnabled(false);
                __pListview->SetShowState(false);
 
                if(__pSearchBar)
@@ -1050,8 +1048,9 @@ BookmarkListForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 void
 BookmarkListForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
-
+       GetFooter()->SetShowState(false);
        __pSearchListView->UpdateList();
+       Invalidate(true);
 }
 
 void

diff --git a/src/IntConfirmationPopup.cpp b/src/IntConfirmationPopup.cpp
index 659d3f6..cf8d676 100644 (file)
--- a/src/IntConfirmationPopup.cpp
+++ b/src/IntConfirmationPopup.cpp
@@ -58,19 +58,19 @@ ConfirmationPopup::Initialize(void)
        Button* pNoButton = null;
        Popup::Construct(L"IDL_CONFIRMATION_POPUP");
 
-       __pYesButton = static_cast< Button* >(GetControl(L"IDC_BOTTOM_BUTTON1", true));
+       __pYesButton = static_cast< Button* >(GetControl(L"IDC_BUTTON_OK", true));
        if (__pYesButton)
        {
                __pYesButton->SetActionId(IDA_BUTTON_YES);
        }
 
-       __pNoButton = static_cast< Button* >(GetControl(L"IDC_BOTTOM_BUTTON2", true));
+       __pNoButton = static_cast< Button* >(GetControl(L"IDC_BUTTON_CANCEL", true));
        if (__pNoButton)
        {
                __pNoButton->SetActionId(IDA_BUTTON_NO);
        }
 
-       __pPopupText = static_cast< Label* >(GetControl(L"IDC_CONFIRMATION_LABEL", true));
+       __pPopupText = static_cast< Label* >(GetControl(L"IDC_LABEL1", true));
 
        return true;
 }

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 3f9116d..b3dad1a 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -1018,6 +1018,7 @@ HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
                        return;
                }
                __pSearchListView->SetEnabled(true);
+               __pGroupedListView->SetBounds(0, __pSearchBar->GetY() + __pSearchBar->GetHeight(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
                Invalidate(true);
                __searchHistory = false;
                r = __pGroupedListView->UpdateList();

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index ecf5023..5211b58 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -112,6 +112,7 @@ InternetApp::OnAppInitialized(void)
 
 //     MultipleWindowPresentationModel::GetInstance();
 
+       SettingInfo::AddSettingEventListener(*this);
        __pMultiWindowManager = MultipleWindowPresentationModel::GetInstance();
        AppLogDebug("window count %d",__pMultiWindowManager->GetAllWindowArrayList()->GetCount());
 
@@ -229,6 +230,17 @@ InternetApp::OnScreenOff(void)
        // callback before the device enters the sleep mode.
        // Similarly, do not perform lengthy operations in this listener method. Any operation must be a quick one.
 }
+
+void
+InternetApp::OnSettingChanged(Tizen::Base::String& key)
+{
+       AppLog("InternetApp::OnSettingChanged: %ls", key.GetPointer());
+       if (key == L"http://tizen.org/setting/locale.language")
+       {
+               Terminate();
+       }
+}
+
 void
 InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operationId, const String* pUriScheme, const String *pDataType, const IMap *pArgs)
 {

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 5ec1b1c..342c107 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2717,7 +2717,9 @@ MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar, bool footerState)
        if(__pWebViewer)
                __pWebViewer->SetFocus();
        if(__pFooterUrlField)
+       {
                __pFooterUrlField->SetFocusable(true);
+       }
        RelayoutControls(false);
 }
 

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index aa90d60..5b63775 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -363,7 +363,7 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
                if (__currentURL.CompareTo(L"") != 0)
                {
                        AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
-                       SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_USER_HOMEPAGE");
+                       SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"));
                        SettingPresentationModel::GetInstance()->SetFavoriteValue(__currentURL);
                        settingInfo[SETTING_FAVORITE_URL].titleText = __currentURL;
 //                     listView.RefreshList(groupIndex, effectiveIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index d018f8c..e12cae2 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -127,7 +127,7 @@ SharePopup::Initialize(void)
        __pShareList = new(std::nothrow) ArrayList();
        __pShareList->Construct();
 
-       __pList = static_cast<ListView*>(GetControl(L"IDC_POPUP_LIST"));
+       __pList = static_cast<ListView*>(GetControl(L"IDC_LISTVIEW"));
        if (__pList == null)
        {
                return false;
@@ -136,7 +136,7 @@ SharePopup::Initialize(void)
        __pList->SetItemProvider(*this);
        __pList->AddListViewItemEventListener(*this);
 
-       pCancelButton = static_cast< Button* >(GetControl(L"IDC_BUTTON", true));
+       pCancelButton = static_cast< Button* >(GetControl(L"IDC_BUTTON1", true));
        if (pCancelButton)
        {
                pCancelButton->AddActionEventListener(*this);
@@ -221,7 +221,7 @@ SharePopup::CreateItem(int index, int itemWidth)
        ListAnnexStyle style = LIST_ANNEX_STYLE_NORMAL;
        int textSize = 35;
        int elementHeight = 50;
-       int listItemWidth = 112;
+       int listItemWidth = 80;
 
        CustomItem* pItem = new(std::nothrow) CustomItem();
        r = pItem->Construct(Dimension(GetClientAreaBounds().width, listItemWidth), style);