Fixed Nabi Issues

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

diff --git a/inc/IntArticleReaderForm.h b/inc/IntArticleReaderForm.h
index a7f0238..25018c1 100644 (file)
--- a/inc/IntArticleReaderForm.h
+++ b/inc/IntArticleReaderForm.h
@@ -101,7 +101,7 @@ class ArticleReaderForm
        //IWebUiEventListener
        virtual void OnWebPageBlockSelected(Tizen::Web::Controls::Web& source, Tizen::Graphics::Point& startPoint, Tizen::Graphics::Point& endPoint);
        virtual void OnWebPageShowRequested(Tizen::Web::Controls::Web& source){}
-       virtual Tizen::Web::Controls::Web* OnWebWindowCreateRequested(void){}
+       virtual Tizen::Web::Controls::Web* OnWebWindowCreateRequested(void){return null;}
        virtual void OnWebWindowCloseRequested(Tizen::Web::Controls::Web& source) {}
 
        result InitSelectTextContextMenu(Tizen::Graphics::Point p);

diff --git a/inc/IntRadioCustomItem.h b/inc/IntRadioCustomItem.h
index 821575d..3ca1053 100644 (file)
--- a/inc/IntRadioCustomItem.h
+++ b/inc/IntRadioCustomItem.h
@@ -66,13 +66,6 @@ public:
        Tizen::Base::String GetText(void);
 
        /**
-        * @brief               The method used to get selection state of the Radio Button
-        * @return              True if selected or false if unselected
-        */
-       bool GetSelected(void);
-
-
-       /**
         * @brief               Add all the required elements and create the Custom Item.
         *
         * @return              An error code
@@ -94,18 +87,10 @@ public:
         */
        void SetText(Tizen::Base::String& text);
 
-       /**
-        * @brief               The method used to set the selection state of the Radio Button
-        * @return              void
-        */
-       void SetSelected(bool selectedValue);
-
 protected:
        static const int IDA_FORMAT_STRING;
-       static const int IDA_FORMAT_RADIO_BUTTON;
 
 private:
-       bool __isSelected;
        int __height;               ///Height of the SettingToggleCustomItem Instance
        Tizen::Base::String __text;   ///The Text for the Toggle Button
        int __width;                ///Width of the SettingToggleCustomItem Instance

diff --git a/res/screen-density-xhigh/00_button_radio.png b/res/screen-density-xhigh/00_button_radio.png
deleted file mode 100644 (file)
index 83a1a54..0000000
Binary files a/res/screen-density-xhigh/00_button_radio.png and /dev/null differ

diff --git a/res/screen-density-xhigh/00_button_radio_selected.png b/res/screen-density-xhigh/00_button_radio_selected.png
deleted file mode 100644 (file)
index 7b00666..0000000
Binary files a/res/screen-density-xhigh/00_button_radio_selected.png and /dev/null differ

diff --git a/res/screen-size-normal/IDL_FORM_HW_KEY.xml b/res/screen-size-normal/IDL_FORM.xml
similarity index 66%
rename from res/screen-size-normal/IDL_FORM_HW_KEY.xml
rename to res/screen-size-normal/IDL_FORM.xml
index 9c23632..30dbc60 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_HW_KEY.xml
+++ b/res/screen-size-normal/IDL_FORM.xml
@@ -4,19 +4,19 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201306101756" Dversion="20120315">
+<Scene Bversion="2.0.0.201306251414" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDL_FORM_HW_KEY">
+    <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
+        <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR" type="LAYOUT_RELATIVE"/>
     </Form>
-    <Panel id="IDC_ADDRESSBAR_PANEL" parent="IDL_FORM_HW_KEY">
+    <Panel id="IDC_ADDRESSBAR_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Panel>
-    <Panel id="IDC_FOOTER_PANEL" parent="IDL_FORM_HW_KEY">
+    <Panel id="IDC_FOOTER_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1108.0"/>
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="555.0"/>
@@ -24,61 +24,61 @@
     <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Button id="IDC_MULTIWINDOW_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_windows_manager_empty.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_multiview.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="26.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="0.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FOOTER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="15.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="15.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FOOTER_PANEL" 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="112.0" x="0.0" y="10.0"/>
     </Button>
     <Button id="IDC_PAGEFORWARD_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_forward_web_disabled.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_forward_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_forward_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="635.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1168.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1168.0" y="10.0"/>
     </Button>
     <Button id="IDC_PAGEBACK_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_back_web_disabled.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="20.0" highlightedBitmapY="20.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_back_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_back_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="542.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1056.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEFORWARD_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1056.0" y="10.0"/>
     </Button>
     <Label id="IDC_FOOTER_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="363.0" x="149.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.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="944.0" x="112.0" y="19.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="15.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="433.0" x="93.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEBACK_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="944.0" x="112.0" y="19.0"/>
     </Label>
     <Button id="IDC_STOP_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.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="64.0" x="982.0" y="35.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
     </Button>
     <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="304.0" x="149.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="870.0" x="112.0" y="19.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="15.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="361.0" x="93.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="870.0" x="112.0" y="19.0"/>
     </EditField>
     <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="12.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="12.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"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.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="64.0" x="982.0" y="35.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
     </Button>
     <Button id="IDC_REFRESH_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.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="54.0" x="982.0" y="35.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
     </Button>
     <Button id="IDC_READER_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="212.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.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="54.0" x="982.0" y="35.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_URL_EDIT_FIELD" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="93.0" y="40.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
     </Button>
-    <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM_HW_KEY">
+    <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Panel>
 </Scene>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index c4de482..af46744 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -303,7 +303,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
 
                                if ( exist == true)
                                {
-                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_BOOKMARK_ALREADY_EXISTS");
+                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_ALREADY_EXISTS");
                                        CreateMessage(msg);
 
                                        AppLogDebug("Bookmark already exists");
@@ -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");
                                        CreateMessage(msg);
 
                                        AppLogDebug("Bookmark already exists");
@@ -725,16 +725,21 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
 
                if (__selectedIndex == index)
                {
-                       radioItem->SetSelected(true);
+//                     radioItem->SetSelected(true);
+                       __pList->SetItemChecked(index,true);
                }
                else
                {
-                       radioItem->SetSelected(false);
+//                     radioItem->SetSelected(false);
+                       __pList->SetItemChecked(index,false);
                }
 
                if(__selectedIndex == 0 && index == 1)
-                       radioItem->SetSelected(true);
-               if (radioItem->GetSelected() == true)
+               {
+//                     radioItem->SetSelected(true);
+                       __pList->SetItemChecked(index,true);
+               }
+               if (__pList->IsItemChecked(index) == true)
                {
                        __folderName = radioItem->GetText();
                }
@@ -1148,7 +1153,7 @@ AddBookmarkForm::CreateMessage(String& str)
        pMsgBox = new(std::nothrow) MessageBox;
        if (pMsgBox != null)
        {
-               pMsgBox->Construct(str, L"", MSGBOX_STYLE_OK, 3000);
+               pMsgBox->Construct(L"", str, MSGBOX_STYLE_OK, 3000);
                pMsgBox->ShowAndWait(__modalMsgBoxResult);
                delete pMsgBox;
                pMsgBox = null;

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index e8efe0e..0dff6d6 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -89,6 +89,7 @@ result
 Addressbar::OnTerminating(void)
 {
        DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_USB_CLIENT, *this);
+       return E_SUCCESS;
 }
 
 result

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 826918d..16be6d5 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -162,10 +162,10 @@ BookmarkListForm::OnInitializing(void)
        __pItemContextFolder->Construct();
        __pItemContextFolder->AddElement(IDA_CONTEXT_ITEM_FOLDER_EDIT, CommonUtil::GetString(L"IDS_BR_SK_EDIT"));
 
-       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL , CONTEXT_ITEM_DELETE_COLOR);
-       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED , CONTEXT_ITEM_DELETE_COLOR);
-       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED , CONTEXT_ITEM_DELETE_COLOR);
        __pItemContextFolder->AddElement(IDA_CONTEXT_ITEM_FOLDER_DELETE, CommonUtil::GetString(L"IDS_BR_SK_DELETE_ABB"), true);
+       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_FOLDER_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_NORMAL , CONTEXT_ITEM_DELETE_COLOR);
+       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_FOLDER_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_HIGHLIGHTED , CONTEXT_ITEM_DELETE_COLOR);
+       __pItemContextFolder->SetElementBackgroundColor(IDA_CONTEXT_ITEM_FOLDER_DELETE,LIST_CONTEXT_ITEM_ELEMENT_STATUS_PRESSED , CONTEXT_ITEM_DELETE_COLOR);
 
        __pItemContextSite = new(std::nothrow) ListContextItem();
        __pItemContextSite->Construct();

diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp
index 65d269a..69f24ec 100644 (file)
--- a/src/IntBookmarkPresentationModel.cpp
+++ b/src/IntBookmarkPresentationModel.cpp
@@ -127,9 +127,9 @@ BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
        DateTime dt;
        String bookmarkId;
        String bookmarkTitle = bookmark.GetBookmarkTitle();
-       bookmarkTitle.Replace(L"'", L"''");
+       bookmarkTitle.Replace(L"'", L"\'");
        String bookmarkUrl = bookmark.GetUrl();
-       bookmarkUrl.Replace(L"'", L"''");
+       bookmarkUrl.Replace(L"'", L"\'");
 
        AppLog("BookmarkPresentationModel::SaveBookmark");
 
@@ -297,9 +297,9 @@ BookmarkPresentationModel::SaveTempBookmark(BookmarkData& bookmark)
        DateTime dt;
        String bookmarkId;
        String bookmarkTitle = bookmark.GetBookmarkTitle();
-       bookmarkTitle.Replace(L"'", L"''");
+       bookmarkTitle.Replace(L"'", L"\'");
        String bookmarkUrl = bookmark.GetUrl();
-       bookmarkUrl.Replace(L"'", L"''");
+       bookmarkUrl.Replace(L"'", L"\'");
 
        PresentationModelBase::GetCurrentDateTime(dt);
 
@@ -715,7 +715,7 @@ BookmarkPresentationModel::GetSearchBookmarkCount(int& searchBookmarkCount, Stri
        String bookmarkTable(BOOKMARK_URL_TABLE);
        result r = E_FAILURE;
        bool nextRowPresent = false;
-       text.Replace(L"'", L"''");
+       text.Replace(L"'", L"\'");
 
        query.Append(L"SELECT COUNT(ID) FROM ");
        query.Append(bookmarkTable);
@@ -742,7 +742,7 @@ BookmarkPresentationModel::GetSearchBookmarkCount(int& searchBookmarkCount, Stri
        searchBookmarkCount = intVal;
 
        CATCH:
-       text.Replace(L"''", L"'");
+//     text.Replace(L"''", L"'");
        return r;
 
 }
@@ -758,7 +758,7 @@ BookmarkPresentationModel::GetSearchFolderCount(int& searchFolderCount, String&
        String bookmarkTable(BOOKMARK_URL_TABLE);
        result r = E_FAILURE;
        bool nextRowPresent = false;
-       text.Replace(L"'", L"''");
+       text.Replace(L"'", L"\'");
 
        query.Append(L"SELECT COUNT(ID) FROM ");
        query.Append(bookmarkTable);
@@ -781,7 +781,7 @@ BookmarkPresentationModel::GetSearchFolderCount(int& searchFolderCount, String&
        searchFolderCount = intVal;
 
        CATCH:
-       text.Replace(L"''", L"'");
+//     text.Replace(L"''", L"'");
        return r;
 }
 
@@ -813,7 +813,7 @@ BookmarkPresentationModel::GetSearchBookmark(int startIndex, int limit, ArrayLis
        String bookmarkTable(BOOKMARK_URL_TABLE);
        result r = E_FAILURE;
 
-       text.Replace(L"'", L"''");
+       text.Replace(L"'", L"\'");
        query.Append(L"SELECT * FROM ");
        query.Append(bookmarkTable);
        query.Append(L" WHERE ((TITLE LIKE '%");
@@ -845,7 +845,7 @@ BookmarkPresentationModel::GetSearchBookmark(int startIndex, int limit, ArrayLis
        TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::CreateBookmarkList failed  %s",GetErrorMessage(r));
 
        CATCH:
-       text.Replace(L"''", L"'");
+//     text.Replace(L"''", L"'");
        return r;
 }
 
@@ -856,7 +856,7 @@ BookmarkPresentationModel::GetSearchFolder(int startIndex, int limit, ArrayList&
        String query;
        String bookmarkTable(BOOKMARK_URL_TABLE);
        result r = E_FAILURE;
-       text.Replace(L"'", L"''");
+       text.Replace(L"'", L"\'");
 
        query.Append(L"SELECT * FROM ");
        query.Append(bookmarkTable);
@@ -888,7 +888,7 @@ BookmarkPresentationModel::GetSearchFolder(int startIndex, int limit, ArrayList&
        TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::CreateBookmarkList failed  %s",GetErrorMessage(r));
 
        CATCH:
-       text.Replace(L"''", L"'");
+//     text.Replace(L"''", L"'");
        return r;
 }
 

diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp
index 8ceeac0..8de040f 100644 (file)
--- a/src/IntBrightnessForm.cpp
+++ b/src/IntBrightnessForm.cpp
@@ -244,11 +244,12 @@ BrightnessForm::OnFormBackRequested(Form& source)
 void
 BrightnessForm::OnActionPerformed(const Control& source, int actionId)
 {
+       result r = E_SUCCESS;
        switch (actionId)
        {
        case IDA_AUTOBTN_CLICKED:
                __manualBrightness = false;
-//             __pBrightnessSlider->SetValue(6);
+               __pBrightnessSlider->SetValue(6);
 //             __pBrightnessSlider->SetShowState(false);
                PowerManager::SetScreenBrightness(6);
                __pBrightnessSlider->SetEnabled(false);
@@ -266,6 +267,24 @@ BrightnessForm::OnActionPerformed(const Control& source, int actionId)
        default:
                break;
        }
+       // save the slider value
+       // save the tab button
+       AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
+       String sliderKey("SliderValue");
+       String tabKey("TabButton");
+       int sliderValue = __pBrightnessSlider->GetValue();
+       r = pAppRegistry->Set(sliderKey,sliderValue);
+       FooterItemStatus footerStatus;
+       GetFooter()->GetItemStatus(0,footerStatus);
+       if (footerStatus == FOOTER_ITEM_STATUS_SELECTED)
+       {
+               r = pAppRegistry->Set(tabKey,0);
+       }
+       else
+       {
+               r = pAppRegistry->Set(tabKey,1);
+       }
+       pAppRegistry->Save();
 }
 
 void

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index f9dbe6e..856c734 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -205,10 +205,10 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                }
                break;
        case IDA_BUTTON_NO:
-               __pConfirmationPopup->SetShowState(false);
-               __pConfirmationPopup->Show();
                if(__pConfirmationPopup)
                {
+                       __pConfirmationPopup->SetShowState(false);
+                       __pConfirmationPopup->Show();
                        delete __pConfirmationPopup;
                        __pConfirmationPopup = null;
                }

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index 0f38013..4c3e04e 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -274,10 +274,10 @@ EditHistoryListForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                }
                break;
        case IDA_BUTTON_NO:
-               __pConfirmationPopup->SetShowState(false);
-               __pConfirmationPopup->Show();
                if(__pConfirmationPopup)
                {
+                       __pConfirmationPopup->SetShowState(false);
+                       __pConfirmationPopup->Show();
                        delete __pConfirmationPopup;
                        __pConfirmationPopup = null;
                }

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index f6d597e..37166e6 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -302,11 +302,7 @@ HistoryListForm::OnActionPerformed(const Control& source, int actionId)
 
                        }
                }
-//             r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
-               if (IsFailed(r))
-               {
-                       return;
-               }
+
        }
        break;
        default:

diff --git a/src/IntHistoryPresentationModel.cpp b/src/IntHistoryPresentationModel.cpp
index 07d7f58..ccce674 100644 (file)
--- a/src/IntHistoryPresentationModel.cpp
+++ b/src/IntHistoryPresentationModel.cpp
@@ -337,6 +337,7 @@ void HistoryPresentationModel::UpdateHistoryFavIcon(History& history, Tizen::Gra
        // added because conversion may fail
        if(GetLastResult() != E_SUCCESS)
                return;
+       delete pFavBuffer;
        history.SetFavIconBitmap(favIconImage);
 
        delete pImage;

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index 6932a3d..6ececde 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -186,17 +186,6 @@ InternetApp::OnAppInitialized(void)
                return false;
        }
 
-       AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
-       String sliderKey("SliderValue");
-
-       int sliderValue = 0;
-
-
-       r = pAppRegistry->Get(sliderKey, sliderValue);
-       r = PowerManager::SetScreenBrightness(sliderValue);
-
-       AppLog("Settingscreenbrightness to %d result %s",sliderValue , GetErrorMessage(r));
-
        delete pArgList;
        pArgList = null;
        __pNewWindowInfo = null;
@@ -224,6 +213,21 @@ InternetApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
 void
 InternetApp::OnForeground(void)
 {
+       AppLog("InternetApp::OnForeground");
+
+       AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
+       String sliderKey("SliderValue");
+
+       int sliderValue = 0;
+
+
+       result r = pAppRegistry->Get(sliderKey, sliderValue);
+       r = PowerManager::SetScreenBrightness(sliderValue);
+//     r = PowerManager::RestoreScreenBrightness();
+
+       AppLog("Settingscreenbrightness to %d result %s",sliderValue , GetErrorMessage(r));
+
+
        Form* pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
        if (pCurrentForm)
        {

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 056e076..4372b64 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -246,6 +246,11 @@ MainForm::~MainForm(void)
                delete __pHitElementResult;
                __pHitElementResult = null;
        }
+       if(__pOptionMenu)
+       {
+               delete __pOptionMenu;
+               __pOptionMenu = null;
+       }
 
        String* pSelectedScene = NULL;
        Object* pValue = NULL;
@@ -262,8 +267,7 @@ MainForm::~MainForm(void)
 bool
 MainForm::Initialize(void)
 {
-       InternetApp* pInternet = static_cast<InternetApp*> (Application::GetInstance());
-       Construct(L"IDL_FORM_HW_KEY");
+       Construct(L"IDL_FORM");
 
 //     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_FOOTER);
        return true;
@@ -793,6 +797,10 @@ result MainForm::InitImageContextMenu(Tizen::Graphics::Point p)
                delete __pImageMenu;
                __pImageMenu = null;
        }
+       if(GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT || GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+       {
+               p.y = p.y + 54;
+       }
 
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_LIST, direction);
@@ -822,8 +830,8 @@ MainForm::InitImageLinkContextMenu(Tizen::Graphics::Point p)
                __pImageMenu = null;
        }
 
-       if(__pAddressbar->GetShowState() == true)
-               p.y = p.y + __pAddressbar->GetHeight();
+//     if(__pAddressbar->GetShowState() == true)
+//             p.y = p.y + __pAddressbar->GetHeight();
        if(GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT || GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE)
        {
                p.y = p.y + 54;
@@ -894,8 +902,6 @@ MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOpt
 
 }
 
-
-
 result
 MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPasteOption = false)
 {
@@ -1595,7 +1601,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                if(__pNotification != null)
                                {
-                                       delete __pNotification;
+                                       RemoveControl(__pNotification);
                                        __pNotification = null;
                                }
                                __pNotification = new (std::nothrow) NotificationPanel(*this);
@@ -1625,7 +1631,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                delete pBookmark;
                                if(__pNotification != null)
                                {
-                                       delete __pNotification;
+                                       RemoveControl(__pNotification);
                                        __pNotification = null;
                                }
                                __pNotification = new (std::nothrow) NotificationPanel(*this);
@@ -1651,7 +1657,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_PRINT_CLICKED:
        {
-               r = __pWebViewer->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf");
+               r = __pWebViewer->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//shared//data//test.pdf");
                AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
 
                AppLog("RequestPrint called!");
@@ -1670,7 +1676,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        String fileCount = L"service_print_files_count";
                        String countVal = L"1";
                        String fileFolder= L"service_print_files_folder_name";
-                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//data";
+                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//shared//data";
 
                        map.Add(&fileCount, &countVal);
                        map.Add(&fileFolder, &folderVal);
@@ -2062,7 +2068,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        delete pBuffer;
                        if(__pNotification != null)
                        {
-                               delete __pNotification;
+                               RemoveControl(__pNotification);
                                __pNotification = null;
                        }
                        __pNotification = new NotificationPanel(*this);
@@ -2956,6 +2962,13 @@ MainForm::OnLoadingCompleted(void)
        {
                return;
        }
+
+       if(__pImageMenu && __pImageMenu->GetShowState())
+       {
+               __pImageMenu->SetShowState(false);
+               __pImageMenu->Invalidate(true);
+       }
+
        if (__pWebViewer->CanGoForward())
        {
                //__pAddressbar->SetForwardButtonEnabled(true);
@@ -3116,6 +3129,7 @@ void
 MainForm::OnEstimatedProgress(int progress)
 {
        AppLogDebug("MainForm::OnEstimatedProgress entered");
+
        if (progress < DEFAULT_PROGRESS_PERCENTAGE)
                progress = DEFAULT_PROGRESS_PERCENTAGE;
        //if(__pAddressbar)
@@ -3598,11 +3612,11 @@ MainForm::UpdateFavicon(void)
 
 }
 
-
 bool
 MainForm::OnLoadingRequested(const Tizen::Base::String& url,
                Tizen::Web::Controls::WebNavigationType type)
 {
+       AppLog("urlk %ls",url.GetPointer());
        // when load new page if find word panel is open its show state is false
        if(__pFindWordControl && __pFindWordControl->GetShowState() == true)
        {
@@ -3618,8 +3632,6 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
                RelayoutControls(false);
        }
 
-
-
        __pFooterPanel->Invalidate(true);
 
        Uri uriInfo;
@@ -3690,7 +3702,6 @@ MainForm::OnWebDataReceived(const Tizen::Base::String& mime,
        return Tizen::Web::Controls::WEB_DECISION_CONTINUE;
 }
 
-
 void
 MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint& endPoint)
 {
@@ -3739,7 +3750,7 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
-                       InitSelectTextContextMenuF(endPoint,true);
+                       InitSelectTextContextMenuF(FloatPoint(endPoint.x,endPoint.y + __pWebViewer->GetY()),true);
                        __pImageMenu->SetShowState(true);
                        __pImageMenu->Show();
                        __pImageMenu->Invalidate(true);
@@ -3753,7 +3764,7 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                                __currentSelectedStr.Clear();
                                __currentSelectedStr = __pHitElementResult->GetUrl();
                        }
-                       InitSelectTextContextMenuF(endPoint,false);
+                       InitSelectTextContextMenuF(FloatPoint(endPoint.x,endPoint.y + __pWebViewer->GetY()),false);
                        __pImageMenu->SetShowState(true);
                        __pImageMenu->Show();
                        __pImageMenu->Invalidate(true);
@@ -4239,7 +4250,8 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
        if (__pHitElementResult->HasImage() == true)
        {
-               InitImageContextMenu(currentPosition);
+               if(__pWebViewer != null)
+                       InitImageContextMenu(Point(currentPosition.x,currentPosition.y + __pWebViewer->GetY()));
                __pImageMenu->SetShowState(true);
                __pImageMenu->Show();
                __pImageMenu->Invalidate(true);
@@ -4257,7 +4269,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                {
                        AppLog(null);
                }
-               InitImageLinkContextMenu(currentPosition);
+               InitImageLinkContextMenu(Point(currentPosition.x,currentPosition.y + __pWebViewer->GetY()));
                __pImageMenu->SetShowState(true);
                __pImageMenu->Show();
                __pImageMenu->Invalidate(true);
@@ -4283,7 +4295,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
-                       InitSelectTextContextMenu(currentPosition,true, true);
+                       InitSelectTextContextMenu(Point(currentPosition.x , currentPosition.y + __pWebViewer->GetY()),true, true);
                        if(__pImageMenu)
                        {
                                __pImageMenu->SetShowState(true);
@@ -4790,7 +4802,9 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
                pList->RemoveAll(true);
                delete pList;
        }
-//     RelayoutControls(false);
+       if(__pAddressbar)
+               __pAddressbar->SetShowState(false);
+       RelayoutControls(false);
        return;
 }
 
@@ -5166,82 +5180,6 @@ MainForm::ReaderClicked()
        return;
 
 
-       int bodyWidth = ((double)(GetClientAreaBounds().width))*0.73;
-
-       CreateReaderPanel();
-       AppLogDebug("MainScene::ReaderClicked entered");
-
-
-       /*if (__pArticleReaderPanel)
-       {
-               AppLogDebug("showstate true for reader panel");
-               __pArticleReaderPanel->SetShowState(true);
-               __pArticleReaderPanel->Show();
-       }*/
-       int xPos = __pArticleReaderPanel->GetX();
-       int yPos = __pArticleReaderPanel->GetY();
-       AppLog("ReaderClicked() xPos = %d",xPos);
-       AppLog("ReaderClicked() yPos = %d",yPos);
-
-       if (__pReaderData == null)
-       {
-               return;
-       }
-
-       String loadData = L"<html>\
-                                       <head>\
-                                       <meta name='viewport' content='width=device-width*0.73,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'>\
-                                       <style>\
-                                       h1\
-                                       {\
-                                       font-weight:bold;\
-                                       background-color: transparent;\
-                                       }\
-                                       div\
-                                       {\
-                                       display: block;\
-                                       }\
-                                       p\
-                                       {\
-                                       display: block; \
-                                       }\
-                                       img\
-                                       {\
-                                       margin-left:auto;\
-                                       margin-right:auto;\
-                                       }\
-                                       \
-                                       \
-                                       </style>\
-                                       </head>\
-                                       <body style='width:'";
-       loadData.Append(bodyWidth);
-       loadData.Append(L"px'>");
-       AppLogDebug("data->GetLength %d",__pReaderData->GetLength());
-       loadData.Append(*__pReaderData);
-       loadData.Append(L"</body></html>");
-
-       ByteBuffer buf ;
-       buf.Construct(loadData.GetLength());
-       AppLogDebug("data->GetLength %d",loadData.GetLength());
-       for (int z=0;z<loadData.GetLength();z++)
-       {
-               mchar b;
-               loadData.GetCharAt(z,b);
-               buf.SetByte((byte)b);
-       }
-
-       buf.Flip();
-       if (__pWebReader != null)
-       {
-               __pWebReader->LoadData(L"",buf,L"text/html");
-               AppLogDebug("LoadData result %s",GetErrorMessage(GetLastResult()));
-       }
-       else
-       {
-               AppLogDebug("cannot LoadData __pWebReader is null");
-       }
-
 }
 
 void MainForm::SetAddressbarMode(AddressBarMode addMode)

diff --git a/src/IntPresentationModelBase.cpp b/src/IntPresentationModelBase.cpp
index a8b9260..16e70e0 100644 (file)
--- a/src/IntPresentationModelBase.cpp
+++ b/src/IntPresentationModelBase.cpp
@@ -263,13 +263,6 @@ PresentationModelBase::DropDBTables(void)
                        query.Format(MAX_DB_QUERY_SIZE, L"DROP TABLE IF EXISTS FaviconData");
                        break;
                }
-
-               default:
-               {
-                       AppLogDebug("PresentationModelBase::CreateDBTables: Table Type:%d is invalid", tableIndex);
-                       break;
-               }
-
                }
 
                r = PresentationModelBase::ExecuteQuery(query, resultCount);
@@ -377,9 +370,9 @@ PresentationModelBase::ExecuteBookmarkQuery(const Tizen::Base::String& formatQue
        DateTime dt;
        String bookmarkId;
        String bookmarkTitle = bookmark.GetBookmarkTitle();
-       bookmarkTitle.Replace(L"'", L"''");
+       bookmarkTitle.Replace(L"'", L"\'");
        String bookmarkUrl = bookmark.GetUrl();
-       bookmarkUrl.Replace(L"'", L"''");
+       bookmarkUrl.Replace(L"'", L"\'");
 
        PresentationModelBase::GetCurrentDateTime(dt);
 
@@ -506,10 +499,10 @@ PresentationModelBase::ExecuteHistoryQuery(const Tizen::Base::String& formatQuer
        int count;
 
        String historyTitle = history.GetHistoryTitle();
-       historyTitle.Replace(L"'", L"''");
+       historyTitle.Replace(L"'", L"\'");
 
        String historyUrl = history.GetHistoryUrl();
-       historyUrl.Replace(L"'", L"''");
+       historyUrl.Replace(L"'", L"\'");
 
        GetCurrentDateTime(date);
 
@@ -998,15 +991,6 @@ PresentationModelBase::GetCurrentDateTime(DateTime& dt)
 
        r = SystemTime::GetCurrentTime(dt);
        return true;
-       if (IsFailed(r))
-       {
-               return false;
-       }
-       localManager.Construct();
-       tz = localManager.GetSystemTimeZone();
-       dt = tz.UtcTimeToWallTime(dtNow);
-
-       return true;
 }
 
 String

diff --git a/src/IntRadioCustomItem.cpp b/src/IntRadioCustomItem.cpp
index 69892b6..5aa68e1 100644 (file)
--- a/src/IntRadioCustomItem.cpp
+++ b/src/IntRadioCustomItem.cpp
@@ -30,18 +30,13 @@ using namespace Tizen::Base;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Controls;
 
-static const wchar_t* IDB_BUTTON_RADIO_PRESS2 = L"00_button_radio_selected.png";
-static const wchar_t* IDB_BUTTON_RADIO_PRESS1 = L"00_button_radio.png";
-
 const int RadioCustomItem::IDA_FORMAT_STRING = 500;
-const int RadioCustomItem::IDA_FORMAT_RADIO_BUTTON = 501;
 
 RadioCustomItem::RadioCustomItem(void)
 {
        __width = 0;
        __height = 0;
        __text = L"";
-       __isSelected = false;
 }
 
 RadioCustomItem::~RadioCustomItem(void)
@@ -57,7 +52,7 @@ RadioCustomItem::Construct(int width, int height)
        __width = width;
        __height = height;
        const Dimension dim(width, height);
-       r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL);
+       r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_RADIO);
 
        return r;
 }
@@ -80,42 +75,11 @@ RadioCustomItem::Make(void)
        result r = E_FAILURE;
        Color textColor = CUSTOM_COLOR_LISTVIEW_TEXT2;
        Color pressedTextColor = CUSTOM_COLOR_LISTVIEW_TEXT;
-       Bitmap* pBitmap = null;
-
-       if (__isSelected == true)
-       {
-               pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_RADIO_PRESS2);
-       }
-       else
-       {
-               pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_RADIO_PRESS1);
-       }
-
-       if ( pBitmap != NULL)
-       {
-               AddElement(Rectangle(26, (__height-pBitmap->GetHeight())/2 + (__fontSize - 44)/2, pBitmap->GetWidth(), pBitmap->GetHeight()), IDA_FORMAT_RADIO_BUTTON, *pBitmap, null);
-               AppLogDebug("RadioCustomItem::the text is %ls",__text.GetPointer());
 
-               r = AddElement(Rectangle(26 + pBitmap->GetWidth() + 10, 5, __width - 26 - 10 - pBitmap->GetWidth(), __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
-               delete pBitmap;
-       }
+       AppLogDebug("RadioCustomItem::the text is %ls",__text.GetPointer());
+       r = AddElement(Rectangle(16, 5, __width - 16 , __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
        TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r));
 
-//     r = SetElementSelectionEnabled(IDA_FORMAT_STRING, true);
-//     TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r));
-
        CATCH:
        return r;
 }
-
-void
-RadioCustomItem::SetSelected(bool selectedValue)
-{
-       __isSelected = selectedValue;
-}
-
-bool
-RadioCustomItem::GetSelected(void)
-{
-       return __isSelected;
-}

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index a41bafe..fbb3a3e 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -258,7 +258,6 @@ SettingForm::OnInitializing(void)
        SceneManager* pSceneManager = NULL;
 
        __fontSize = CommonUtil::GetFontSize();
-       InternetApp* pInternet = static_cast<InternetApp*> (Application::GetInstance());
 
        bool isHwKeySupported = false;
 
@@ -657,8 +656,6 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_RADIO)
        {
-
-
                RadioCustomItem* pItem = new(std::nothrow) RadioCustomItem();
                int parentIndex = 0;
                for (parentIndex = effectiveIndex; parentIndex > SETTING_INVALID; parentIndex--)
@@ -702,7 +699,8 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                //if (pBitmap != null)
                //      pItem->AddElement(Rectangle(0, 0, 10, 112), IDA_LIST_LEFT_SIDE_MARGIN, *pBitmap, null);
 
-               pItem->SetSelected(settingInfo[effectiveIndex].isSelected);
+//             pItem->SetSelected(settingInfo[effectiveIndex].isSelected);
+               __pList->SetItemChecked(groupIndex,itemIndex,settingInfo[effectiveIndex].isSelected);
                pItem->Make();
 
                return pItem;