Fixed Nabi Issues
authorVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 7 Jun 2013 23:15:47 +0000 (04:45 +0530)
committerVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 7 Jun 2013 23:15:47 +0000 (04:45 +0530)
Change-Id: I5962edd6f2b464ddc2f6f61101f18a3d00234821
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
31 files changed:
inc/IntAddBookmarkForm.h
inc/IntAddressbar.h
inc/IntBookmarkListForm.h
inc/IntCommonLib.h
inc/IntEditBookmarkListForm.h
inc/IntEditHistoryListForm.h
inc/IntFormFactory.h
inc/IntHistoryListForm.h
inc/IntMainForm.h
inc/IntMultipleWindowForm.h
inc/IntMultipleWindowPresentationModel.h
inc/IntSettingForm.h
inc/IntSharePopup.h
res/screen-size-normal/IDL_ADD_BOOKMARK.xml
res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
src/IntAddBookmarkForm.cpp
src/IntAddressbar.cpp
src/IntBookmarkListForm.cpp
src/IntCommonLib.cpp
src/IntEditBookmarkListForm.cpp
src/IntEditHistoryListForm.cpp
src/IntFormFactory.cpp
src/IntHistoryListForm.cpp
src/IntInternetApp.cpp
src/IntMainForm.cpp
src/IntMultipleWindowForm.cpp
src/IntMultipleWindowPresentationModel.cpp
src/IntSettingForm.cpp
src/IntSettingPresentationModel.cpp
src/IntSharePopup.cpp

index 38614fc..a7d7bfc 100644 (file)
@@ -112,6 +112,7 @@ class AddBookmarkForm
        static const int IDA_LIST_LEFT_SIDE_MARGIN;
        static const int IDA_LIST_LEFT_SIDE_MARGIN_DROPDOWN;
   private:
+       int __fontSize;
        int __folderCount;                                    // Number of bookmark folders
        Tizen::Base::String __folderName;                     // Selected folder name
        int __listHeight;
index 57579bd..18623e5 100644 (file)
@@ -170,6 +170,8 @@ class Addressbar
        void SetAddressbarURLFocus();
 
        Tizen::Base::String GetAddressbarURL();
+
+       bool HasCurrentFocus(void);
   private:
        /**
         * @brief        Updates the progressbar Value.
index be2b9fa..9529740 100644 (file)
@@ -143,6 +143,7 @@ class BookmarkListForm
        Tizen::Base::String __searchText;
        int __selectedindex;
        Tizen::Base::String __selectedTitle;
+       int __fontSize;
   };
 
 #endif  //_INT_BOOKMARK_LIST_FORM_H_
index 3727855..995d0da 100644 (file)
@@ -98,6 +98,14 @@ public:
         */
        static Tizen::Base::String GetString(const Tizen::Base::String& resourceId);
 
+       /**
+        * Gets the font size from the settings
+        *
+        * @return              Int
+        * @param[in]   void
+        * @remarks             Gets the font size
+        */
+       static int GetFontSize(void);
 
 private:
        static CommonBitmapTable __commonBitmapTable[];
index 3ac820f..5f365d3 100644 (file)
@@ -112,6 +112,7 @@ private:
        Tizen::Ui::Controls::ListView* __pListview;
        Tizen::Base::Collection::ArrayList* __pSelectedList;
        int __selectedItemCount;
+       int __fontSize;
   };
 
 #endif /* _INT_EDIT_BOOKMARK_LIST_FORM_H_ */
index 23f2850..899668a 100644 (file)
@@ -128,6 +128,7 @@ class EditHistoryListForm
        Tizen::Ui::Controls::CheckButton* __pSelectAllCheck;
        Tizen::Ui::Controls::Label* __pSelectedLabel;
        int __selectedCount;
+       int __fontSize;
 
        class GroupItemClass
        :public Tizen::Base::Object
index eccfabf..389575d 100644 (file)
@@ -52,6 +52,7 @@ extern const wchar_t* IDL_FORM_BRIGHTNESS_SCENE;
  */
 class FormFactory
        : public Tizen::Ui::Scenes::IFormFactory
+       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        /**
@@ -72,6 +73,13 @@ public:
         * @remarks             To work properly, the existing formId and sceneId has to be passed.
         */
        virtual Tizen::Ui::Controls::Form* CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Scenes::SceneId& sceneId);
+       void SetFontSize(Tizen::Ui::Container& container, int font);
+
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
+                       const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
+                       const Tizen::Ui::Scenes::SceneId& nextSceneId){}
 };
 
 #endif // _INT_SCENE_FACTORY_H_
index 987954d..0a7444d 100644 (file)
@@ -134,6 +134,7 @@ private:
        bool __searchHistory;
        Tizen::Base::String __searchText;
        Tizen::Ui::Scenes::SceneId __previousSceneId;
+       int __fontSize;
 };
 
 /**
@@ -143,11 +144,7 @@ private:
 class GroupItemClass
        :public Tizen::Base::Object
 {
-private:
-       Tizen::Base::DateTime __startTime;
-       Tizen::Base::DateTime __endTime;
-       Tizen::Base::String __titleText;
-       Tizen::Base::Collection::ArrayList* __pData;
+
 
 public:
        GroupItemClass(void);
@@ -218,5 +215,11 @@ public:
         */
        void SetHistoryData(Tizen::Base::Collection::ArrayList* pData);
 
+private:
+       Tizen::Base::DateTime __startTime;
+       Tizen::Base::DateTime __endTime;
+       Tizen::Base::String __titleText;
+       Tizen::Base::Collection::ArrayList* __pData;
+
 };
 #endif /* _INT_HISTORY_LIST_FORM_H_ */
index 6c983e9..10b9711 100644 (file)
@@ -223,6 +223,7 @@ public:
        virtual void OnWebKeypadClosed(Tizen::Web::Controls::Web& source);
        virtual void OnWebKeypadOpened(Tizen::Web::Controls::Web& source);
        virtual void OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source);
+       virtual void OnWebKeypadBoundsChanged(Tizen::Web::Controls::Web& source);
 
        //ITouchEventListener
        virtual void OnTouchDoublePressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
@@ -385,7 +386,7 @@ private:
        Tizen::Ui::Controls::Button* __pClearBtn;
        Tizen::Ui::Controls::Button* __pReaderBtn;
        Tizen::Graphics::Point __longPressPoint;
-
+       int __fontSize;
 };
 
 #endif  //_INT_MAIN_FORM_H_
index 220c482..dba45cd 100644 (file)
@@ -156,7 +156,7 @@ private:
        Tizen::Graphics::Bitmap* __pListDeleteImage;
        ConfirmationPopup* __pConfirmationPopup;
        Tizen::Graphics::Point __startPosition;
-
+       int __fontSize;
 };
 
 #endif /* _INT_MULTIPLE_WINDOW_FORM_H_ */
index 2bccb4f..903dbfb 100644 (file)
@@ -91,7 +91,7 @@ public:
         *@param[in]    no input parameter
         *@retval               no return value
         */
-       WindowInfo* CreateNewMainViewScene(const Tizen::Base::String& Url = L"", bool isAppControlTriggered = false);
+       WindowInfo* CreateNewMainViewSceneN(const Tizen::Base::String& Url = L"", bool isAppControlTriggered = false);
 
        /**
         * To get active Window URL and title
index 5292679..a10396b 100644 (file)
@@ -203,6 +203,7 @@ private:
        Tizen::Ui::Controls::Popup* __pResetPopup;
        WindowInfo* __pWindowInfo;                          // Contains window information of current scene
        bool __isCurrentPageDisable;
+       int __fontSize;
 
 };
 
index 810fa47..0905fa0 100644 (file)
@@ -85,6 +85,7 @@ private:
 
 class SharePopup
   : public Tizen::App::IAppControlEventListener
+  , public Tizen::Base::Runtime::ITimerEventListener
   , public Tizen::Ui::Controls::IListViewItemEventListener
   , public Tizen::Ui::Controls::IListViewItemProvider
   , public Tizen::Ui::Controls::Popup
@@ -123,6 +124,9 @@ class SharePopup
 
        void RemoveAllShareInfo();
 
+       //ITimerEventListener
+       virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
+
        //IActionEventListener
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
@@ -169,7 +173,7 @@ class SharePopup
        Tizen::Ui::Controls::ListView*  __pList;
        Tizen::Base::Collection::ArrayList* __pShareList;
        bool __appControlOngoing;
-
+       Tizen::Base::Runtime::Timer* __pTimer;
   };
 
 #endif /* INTSHAREPOPUP_H_ */
index 2a48b8a..21ce068 100644 (file)
@@ -3,6 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
+
 <Scene Bversion="2.0.0.201305162056" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ADD_BOOKMARK">
     <Label id="IDC_LABEL2" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="243.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="20.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="266.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="80.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="258.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="20.0"/>
+    </Label>
+    <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="22.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="22.0"/>
     </Label>
     <EditField id="IDC_EDITFIELD1" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="64.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="68.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_LABEL3" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="70.0"/>
     </EditField>
     <Label id="IDC_LABEL8" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="140.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="38.0" y="68.0"/>
-    </Label>
-    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="144.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="26.0" y="148.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="150.0"/>
     </Label>
     <EditField id="IDC_EDITFIELD2" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_LABEL6" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="186.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="196.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="196.0"/>
     </EditField>
+    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="144.0"/>
+        <layout bottomRelation="IDC_EDITFIELD2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="44.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1254.0" x="26.0" y="152.0"/>
+    </Label>
     <Label id="IDC_LABEL4" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="IDC_LABEL2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD2" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="262.0"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_EDITFIELD2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_EDITFIELD2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="286.0"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="None" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1238.0" x="26.0" y="276.0"/>
     </Label>
     <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
     <Label id="IDC_LABEL7" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="20.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="38.0" y="20.0"/>
-    </Label>
-    <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="22.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="26.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="38.0" y="20.0"/>
     </Label>
 </Scene>
index aeab3a8..36186a2 100644 (file)
@@ -3,41 +3,42 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="3.0.0.201302121633" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_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="#889AB2" 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="104" disabledIconPath="I01_controlbar_icon_delete_disable.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_delete.png" pressedIconPath="" selectedIconPath="" text=""/>
+            <footerItem accessibilityHint="" actionId="104" disabledIconPath="I01_controlbar_icon_delete_disable.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_delete.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_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <Panel id="IDC_INFO_PANEL" parent="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundColor="#444444" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" 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="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="939"/>
-        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="424"/>
+        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.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="957.0"/>
+        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.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="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="424.0"/>
     </Panel>
     <Label id="IDC_INFO_LABEL" parent="IDC_INFO_PANEL">
-        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="#FFFFFF" textSize="35" textStyle="LABEL_TEXT_STYLE_NORMAL" 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="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#FFFFFF" textSize="35.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.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="60.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>
     <CheckButton id="IDC_SELECT_CHECKBUTTON" parent="IDL_EDIT_BOOKMARK_LIST">
-        <property backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="0" x="0" y="0"/>
+        <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="0.0" x="0" y="0.0"/>
     </CheckButton>
     <ListView id="IDC_LISTVIEW1" parent="IDL_EDIT_BOOKMARK_LIST">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="827" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="112"/>
-        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="327" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="108"/>
+        <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_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="845.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_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_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="112.0"/>
+        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="327.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="108.0"/>
     </ListView>
 </Scene>
index 8de0833..7aed7ee 100644 (file)
@@ -3,37 +3,38 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="3.0.0.201301151800" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_HISTORY_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_TEXT" 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="false"/>
         <itemSet>
-            <footerItem actionId="109" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_BR_SK_DELETE_ABB"/>
-            <footerItem actionId="110" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_BR_SK_CANCEL"/>
+            <footerItem accessibilityHint="" actionId="109" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_BR_SK_DELETE_ABB"/>
+            <footerItem accessibilityHint="" actionId="110" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_BR_SK_CANCEL"/>
         </itemSet>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" 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="::IDS_BR_SK_DELETE_ABB" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" 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="" showBackButton="false" titleIconPath="" titleText="::IDS_BR_SK_DELETE_ABB" titleTextColor=""/>
         <itemSet/>
     </Header>
     <CheckButton id="IDC_SELECT_ALL" parent="IDL_EDIT_HISTORY_LIST">
-        <property backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_MIDDLE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_MIDDLE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
     </CheckButton>
     <Label id="IDC_LABEL1" parent="IDL_EDIT_HISTORY_LIST">
-        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_CENTER" text="Selected(0)" textColor="#FFFFFF" textSize="35" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="939"/>
-        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50" 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="434"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="Selected(0)" textColor="#FFFFFF" textSize="35.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="957.0"/>
+        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="434.0"/>
     </Label>
     <GroupedListView id="IDC_GROUPEDLISTVIEW1" parent="IDL_EDIT_HISTORY_LIST">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sectionColor="" sweepEnabled="false" textOfEmptyList="Empty List"/>
-        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="827" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="112"/>
-        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="337" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="108"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sectionColor="" sweepEnabled="false" textOfEmptyList="Empty List"/>
+        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="845.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="112.0"/>
+        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="337.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="108.0"/>
     </GroupedListView>
 </Scene>
index 728cdf5..5998543 100644 (file)
@@ -54,7 +54,8 @@ const int AddBookmarkForm::IDA_LIST_LEFT_SIDE_MARGIN = 104;
 const int AddBookmarkForm::IDA_LIST_LEFT_SIDE_MARGIN_DROPDOWN = 105;
 
 AddBookmarkForm::AddBookmarkForm(void)
-:__folderCount(0)
+:__fontSize(36)
+,__folderCount(0)
 ,__folderName(CommonUtil::GetString(L"IDS_BR_TAB_BOOKMARKS"))
 ,__listHeight(H_TITLE_ITEM_HEIGHT)
 , __oldFolderCount(0)
@@ -158,6 +159,7 @@ AddBookmarkForm::OnInitializing(void)
        r = __pScrollPanel->SetClientAreaHeight(__pList->GetY() + __listHeight);
        ScrollPanelScrollDirection direction = __pScrollPanel->GetScrollDirection();
        AppLogDebug("ScrollDirection = %d SetClientAreaHeight ret = %s value = %d autoresize = %d",direction,GetErrorMessage(r),__pScrollPanel->GetClientAreaBounds().height,__pScrollPanel->IsScrollAreaAutoResizingEnabled());
+       __fontSize = CommonUtil::GetFontSize();
        r = E_SUCCESS;
 
        return r;
@@ -576,6 +578,8 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
        DropDownCustomItem* pItem = null;
        Bitmap* pBitmap = null;
        pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_LIST_LEFT_SIDE);
+       const Color ITEM_RADIO_ITEM_BACKGROUND_COLOR = CUSTOM_COLOR_SETTINGS_LISTITEM_RADIO_BACKGROUND;
+       const Color ITEM_BACKGROUND_COLOR_HIGHLIGHTED = CUSTOM_BACKGROUND_COLOR_LISTVIEW_PRESSED_HIGHLIGHTED;
        if(itemWidth == 0)
        {
                itemWidth = __pList->GetWidth();
@@ -602,6 +606,7 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
                        pItem->SetCurState(DROP_DOWN__ITEM_STATE_CLOSED);
                }
 
+
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
@@ -635,9 +640,13 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
                                delete pBitmap;
                                return null;
                        }
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_RADIO_ITEM_BACKGROUND_COLOR);
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
+
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
                        folderTitle = CommonUtil::GetString(L"IDS_BR_TAB_BOOKMARKS") ;
                        radioItem->SetText(folderTitle);
                }
@@ -659,9 +668,11 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
                                return null;
                        }
 
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_RADIO_ITEM_BACKGROUND_COLOR);
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
                        radioItem->SetText(folderTitle);
                }
                else
@@ -678,9 +689,11 @@ AddBookmarkForm::CreateItem(int index, int itemWidth)
                        }
                        //radioItem->AddElement(Rectangle(MARGIN_X, 0, __pList->GetBounds().width, LIST_ITEM_HEIGHT), IDA_FORMAT_STRING1, CommonUtil::GetString(L"IDS_CREATE_NEW_FOLDER"), textsize, Color::GetColor(COLOR_ID_BLACK), Color::GetColor(COLOR_ID_BLACK), Color::GetColor(COLOR_ID_BLACK), true);
                        folderTitle = CommonUtil::GetString(L"IDS_BR_OPT_NEW_FOLDER");
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
-                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_RADIO_ITEM_BACKGROUND_COLOR);
+                       radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
+//                     radioItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND);
                        radioItem->SetText(folderTitle);
 
                }
index 63fb2f5..3293c78 100644 (file)
@@ -700,3 +700,9 @@ Addressbar::GetAddressbarURL()
 {
        return __pAddressbarUrlField->GetText();
 }
+
+bool
+Addressbar::HasCurrentFocus()
+{
+       return __pAddressbarUrlField->HasFocus();
+}
index 6819afa..704a632 100644 (file)
@@ -80,6 +80,7 @@ BookmarkListForm::BookmarkListForm(void)
        __selectedindex = 0;
        __searchText = L"";
        __previousSceneId = L"";
+       __fontSize = 44;
 }
 
 BookmarkListForm::~BookmarkListForm(void)
@@ -158,6 +159,7 @@ BookmarkListForm::OnInitializing(void)
                return E_FAILURE;
        }
 
+       __fontSize = CommonUtil::GetFontSize();
        __pItemContextFolder = new(std::nothrow) ListContextItem();
        __pItemContextFolder->Construct();
        __pItemContextFolder->AddElement(IDA_CONTEXT_ITEM_FOLDER_EDIT, CommonUtil::GetString(L"IDS_BR_SK_EDIT"));
@@ -592,17 +594,17 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
        }
        if ( pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER )
        {
-               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth,112), LIST_ANNEX_STYLE_DETAILED);
+               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth,112 - 44 + __fontSize), LIST_ANNEX_STYLE_DETAILED);
                TryCatch(!IsFailed(r),,"BookmarkListForm::CreateItem Construct failed %s",GetErrorMessage(r));
 
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_FOLDER_OPEN);
                if (pBitmap != null)
                {
-                       pItem->AddElement(Rectangle(x_Margin_Icon, 20, width_Icon, height_Icon), IDA_FORMAT_ICON, *pBitmap, null);
+                       pItem->AddElement(Rectangle(x_Margin_Icon, 20+(__fontSize - 44)/2, width_Icon, height_Icon), IDA_FORMAT_ICON, *pBitmap, null);
                        delete pBitmap;
                }
 
-               pItem->AddElement(Rectangle(x_Margin_Title, 26, width_Title, 60), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(), true);
+               pItem->AddElement(Rectangle(x_Margin_Title, 26, width_Title, 60 + (__fontSize - 44) ), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 
                if ( __pItemContextFolder != NULL)
                {
@@ -611,7 +613,7 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
        }
        else
        {
-               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, itemHeight), style);
+               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, itemHeight - 44 + __fontSize), style);
                TryCatch( !IsFailed(r),,"BookmarkListForm::CreateItem Construct failed %s",GetErrorMessage(r));
 
                AppLogDebug("BookmarkListForm::faviconid %ls",pBookMark->GetFaviconId().GetPointer());
@@ -660,12 +662,12 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
                        AppLogDebug("BookmarkListForm::CreateItem bitmap is null");
                        pBitmap = FaviconManager::GetInstance()->GetDefaultFaviconN();
                }
-               pItem->AddElement(Rectangle(x_Margin_Icon, y_Margin_Icon, width_Icon, height_Icon), IDA_FORMAT_ICON, *pBitmap, null);
-               pItem->AddElement(Rectangle(x_Margin_Title, 0, width_Title, itemHeight - height_Url), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),44,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+               pItem->AddElement(Rectangle(x_Margin_Icon, y_Margin_Icon +(__fontSize - 44)/2, width_Icon, height_Icon), IDA_FORMAT_ICON, *pBitmap, null);
+               pItem->AddElement(Rectangle(x_Margin_Title, 0, width_Title, itemHeight - height_Url - 44 + __fontSize), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),__fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 //             if(__pSearchBar->GetMode() == SEARCH_BAR_MODE_INPUT)
 //                     pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 //             else
-                       pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+                       pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url - 44 + __fontSize, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
 
                if (pBitmap != null)
                {
@@ -1101,6 +1103,7 @@ BookmarkListForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui:
                }
 
                __searchText = __pSearchBar->GetText();
+               AppLog("SearchbarGettext result %s",GetErrorMessage(GetLastResult()));
                __searchBookmark = true;
                __pListview->SetShowState(false);
                __pSearchListView->SetEnabled(true);
index 46edda8..5995da8 100644 (file)
 
 #include <FApp.h>
 #include <FMedia.h>
+#include <FSystem.h>
 #include "IntCommonLib.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
 using namespace Tizen::Media;
+using namespace Tizen::System;
+
+const int FONT_MAIN_TEXT_SIZE_GIANT = 98;
+const int FONT_MAIN_TEXT_SIZE_HUGE = 81;
+const int FONT_MAIN_TEXT_SIZE_LARGE = 64;
+const int FONT_MAIN_TEXT_SIZE_NORMAL = 44;
+const int FONT_MAIN_TEXT_SIZE_SMALL = 36;
+const wchar_t* SETTING_INFO_KEY_FONT_SIZE = L"http://tizen.org/setting/font.size";
 
 CommonBitmapTable CommonUtil::__commonBitmapTable[] = {
 
@@ -195,3 +204,37 @@ CommonUtil::GetNinepatchedBitmapN(const String& strPath, const int width, const
 
        return null;
 }
+
+int
+CommonUtil::GetFontSize(void)
+{
+       int fontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
+       return fontSize;
+       String fontSizeValue;
+
+       if (SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, fontSizeValue) == E_SUCCESS)
+       {
+               if (fontSizeValue.Equals(L"giant", false))
+               {
+                       fontSize = FONT_MAIN_TEXT_SIZE_GIANT;
+               }
+               else if (fontSizeValue.Equals(L"huge", false))
+               {
+                       fontSize = FONT_MAIN_TEXT_SIZE_HUGE;
+               }
+               else if (fontSizeValue.Equals(L"large", false))
+               {
+                       fontSize = FONT_MAIN_TEXT_SIZE_LARGE;
+               }
+               else if (fontSizeValue.Equals(L"medium", false))
+               {
+                       fontSize = FONT_MAIN_TEXT_SIZE_NORMAL;
+               }
+               else
+               {
+                       fontSize = FONT_MAIN_TEXT_SIZE_SMALL;
+               }
+       }
+       return fontSize;
+}
+
index 488f442..a53f67f 100644 (file)
@@ -73,6 +73,7 @@ EditBookmarkListForm::EditBookmarkListForm(void)
        __pCheckButton = null;
        __pConfirmationPopup = null;
        __pSelectedList = null;
+       __fontSize = 44;
 }
 
 EditBookmarkListForm::~EditBookmarkListForm(void)
@@ -115,6 +116,7 @@ EditBookmarkListForm::OnInitializing(void)
                pSceneManager->AddSceneEventListener(IDSCN_EDIT_BOOKMARK_LIST, *this);
        }
 
+       __fontSize = CommonUtil::GetFontSize();
        Header* pHeader = GetHeader();
 
        if (pHeader == NULL)
@@ -414,32 +416,32 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
        }
        if (pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER)
        {
-               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 112), style);
+               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 112 - 44 + __fontSize), style);
                TryCatch( r == E_SUCCESS,,"EditBookmarkListForm::CreateItem contruct item failed  %s",GetErrorMessage(r));
 
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_FOLDER_OPEN);
 
                if (pBitmap != null)
                {
-                       pItem->AddElement(Rectangle(16, 26, 60, 60), IDA_FORMAT_ICON, *pBitmap, null);
+                       pItem->AddElement(Rectangle(16, 26+(__fontSize - 44)/2, 60, 60), IDA_FORMAT_ICON, *pBitmap, null);
                        delete pBitmap;
                }
 
-               pItem->AddElement(Rectangle(92, 8, width_Title/*__pListview->GetWidth() - 92 - 80*/, 112), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(), true);
+               pItem->AddElement(Rectangle(92, 8, width_Title/*__pListview->GetWidth() - 92 - 80*/, 112 + (__fontSize - 44)), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 
 
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ITEM);
 
                if (pBitmap != null)
                {
-                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 80, 20, 60, 60), IDA_FORMAT_BITMAP, *pBitmap, null, null);
+                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 80, 20 + (__fontSize - 44)/2, 60, 60), IDA_FORMAT_BITMAP, *pBitmap, null, null);
                        pItem->SetElementSelectionEnabled(IDA_FORMAT_BITMAP, true);
                        delete pBitmap;
                }
        }
        else
        {
-               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128), style);
+               r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128 + (__fontSize - 44)), style);
                TryCatch( r == E_SUCCESS,,"EditBookmarkListForm::CreateItem contruct item failed  %s",GetErrorMessage(r));
 
                pBitmap = pBookMark->GetFavIconBitmap();
@@ -449,17 +451,17 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
                        pBitmap = FaviconManager::GetInstance()->GetDefaultFaviconN();
                }
 
-               pItem->AddElement(Rectangle(16, 28, 72, 72), IDA_FORMAT_ICON, *pBitmap, null);
+               pItem->AddElement(Rectangle(16, 28 + (__fontSize - 44)/2, 72, 72), IDA_FORMAT_ICON, *pBitmap, null);
                delete pBitmap;
 
-               pItem->AddElement(Rectangle(104, 10, width_Title, itemHeight - height_Url), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(), true);
-               pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+               pItem->AddElement(Rectangle(104, 10, width_Title, itemHeight - height_Url + (__fontSize - 44)), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),__fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+               pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url + (__fontSize - 44), width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
 
                //pBitmap = AppResource::GetInstance()->GetBitmapN("I01_picker_arrow_right.png");
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_RIGHT_ARROW);
                if (pBitmap != null)
                {
-                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 84, 32, 64, 64), IDA_FORMAT_BITMAP, *pBitmap, null, null);
+                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 84, 32 + (__fontSize - 44)/2, 64, 64), IDA_FORMAT_BITMAP, *pBitmap, null, null);
                        pItem->SetElementSelectionEnabled(IDA_FORMAT_BITMAP, true);
                        delete pBitmap;
                }
index a6b1f1f..095da6c 100644 (file)
@@ -62,6 +62,7 @@ EditHistoryListForm::EditHistoryListForm(void)
 ,__pSelectedLabel(null)
 ,__selectedCount(0)
 ,__isNoHistoryPresent(true)
+,__fontSize(44)
 {
 }
 
@@ -95,6 +96,8 @@ EditHistoryListForm::OnInitializing(void)
        AppLogDebug("EditHistoryListForm::OnInitializing");
        SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
 
+       __fontSize = CommonUtil::GetFontSize();
+
        Header* pHeader = GetHeader();
 
        if (pHeader == NULL)
@@ -527,7 +530,7 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        Bitmap* pBitmap = null;
 
-       r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128), LIST_ANNEX_STYLE_MARK);
+       r = pItem->Construct(Tizen::Graphics::Dimension(itemWidth, 128 + (__fontSize - 44)), LIST_ANNEX_STYLE_MARK);
 
 
 
@@ -539,10 +542,10 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        if (pBitmap != null)
        {
-               pItem->AddElement(Rectangle(16, 26, 60, 60), IDA_FORMAT_ICON, *pBitmap, null);
+               pItem->AddElement(Rectangle(16, 26  + (__fontSize - 44)/2, 60, 60), IDA_FORMAT_ICON, *pBitmap, null);
                delete pBitmap;
        }
-       r = pItem->AddElement(Rectangle(92, 4, GetClientAreaBounds().width - 96 - 32 -64 -32, 60), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), 44,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+       r = pItem->AddElement(Rectangle(92, 4, GetClientAreaBounds().width - 96 - 32 -64 -32, 60  + (__fontSize - 44)), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), __fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
        if (IsFailed(r))
        {
                delete pItem;
@@ -550,7 +553,7 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                return null;
        }
 
-       pItem->AddElement(Rectangle(92, 68, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+       pItem->AddElement(Rectangle(92, 68  + (__fontSize - 44), GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
 
        return pItem;
 }
index 5ee2843..436d95a 100644 (file)
@@ -25,6 +25,7 @@
 #include "IntArticleReaderForm.h"
 #include "IntBookmarkListForm.h"
 #include "IntBrightnessForm.h"
+#include "IntCommonLib.h"
 #include "IntCreateBookmarkFolderForm.h"
 #include "IntEditBookmarkListForm.h"
 #include "IntEditHistoryListForm.h"
 #include "IntFormFactory.h"
 #include "IntSettingForm.h"
 
-
+using namespace Tizen::App;
 using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
@@ -216,5 +219,102 @@ FormFactory::CreateFormN(const String& formId, const SceneId& sceneId)
                pNewForm = pForm;
        }
        AppLogDebug("FormFactory createForm exit");
+//     pSceneManager->AddSceneEventListener(sceneId, *this);
        return pNewForm;
 }
+
+
+void
+FormFactory::SetFontSize(Container& container, int font)
+{
+       IList* pControls = container.GetControls();
+       if(pControls == null)
+       {
+               return;
+       }
+       for(int count = 0; count < pControls->GetCount(); count++)
+       {
+               //Check if the control is again an container
+               Container *pContainer = dynamic_cast<Container*>(pControls->GetAt(count));
+               if(pContainer != null)
+               {
+                       SetFontSize(*pContainer, font);
+               }
+               else //Check if it is a button
+               {
+                       Button *pButton = dynamic_cast<Button*>(pControls->GetAt(count));
+                       if(pButton != null)
+                       {
+                               pButton->SetTextSize(font);
+                       }
+                       else //Check if a label
+                       {
+                               Label *pLabel = dynamic_cast<Label*>(pControls->GetAt(count));
+                               if(pLabel != null)
+                               {
+                                       pLabel->SetTextConfig(font, pLabel->GetTextStyle());
+                               }
+                               else //Check if a EditField
+                               {
+                                       EditField *pEditField = dynamic_cast<EditField*>(pControls->GetAt(count));
+                                       if(pEditField != null)
+                                       {
+                                               pEditField->SetTextSize(font);
+                                       }
+                                       else //Check if a EditArea
+                                       {
+                                               EditArea *pEditArea = dynamic_cast<EditArea*>(pControls->GetAt(count));
+                                               if(pEditArea != null)
+                                               {
+                                                       pEditArea->SetTextSize(font);
+                                               }
+                                               else //Check if a ExpandableEditArea
+                                               {
+                                                       ExpandableEditArea *pExpandableEditArea = dynamic_cast<ExpandableEditArea*>(pControls->GetAt(count));
+                                                       if(pExpandableEditArea != null)
+                                                       {
+                                                               pExpandableEditArea->SetTextSize(font);
+                                                       }
+                                                       else //Check if a TextBox
+                                                       {
+                                                               TextBox *pTextBox = dynamic_cast<TextBox*>(pControls->GetAt(count));
+                                                               if(pTextBox != null)
+                                                               {
+                                                                       pTextBox->SetTextSize(font);
+                                                               }
+                                                               else //Check if a SearchBar
+                                                               {
+                                                                       SearchBar *pSearchBar = dynamic_cast<SearchBar*>(pControls->GetAt(count));
+                                                                       if(pSearchBar != null)
+                                                                       {
+                                                                               pSearchBar->SetSearchFieldTextSize(font);
+                                                                       }
+                                                                       else //Check if a List
+                                                                       {
+
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+}
+
+void
+FormFactory::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       AppLog("FormFactory::OnSceneActivatedN");
+       Form *pForm = UiApp::GetInstance()->GetFrameAt(0)->GetCurrentForm();
+
+       if(pForm != null)
+       {
+               String fontSizeStr = "";
+               int fontSize = CommonUtil::GetFontSize();
+               AppLog("Font sizeStr: %ls, fontsize:%d", fontSizeStr.GetPointer(), fontSize);
+               SetFontSize(*pForm, fontSize);
+               pForm->Invalidate(true);
+       }
+}
index 288ccc6..578126a 100644 (file)
@@ -128,6 +128,7 @@ HistoryListForm::OnInitializing(void)
                pSceneManager->AddSceneEventListener(IDSCN_HISTORY_LIST, *this);
        }
 
+       __fontSize = CommonUtil::GetFontSize();
        if (pAppResource == null)
        {
                return E_FAILURE;
@@ -533,7 +534,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                delete pItem;
                return null;
        }
-       r = pItem->Construct(Dimension(itemWidth, 128), LIST_ANNEX_STYLE_NORMAL);
+       r = pItem->Construct(Dimension(itemWidth, 128 - 44 + __fontSize), LIST_ANNEX_STYLE_NORMAL);
        if (IsFailed(r))
        {
                delete pItem;
@@ -567,7 +568,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        if (pBitmap != null)
        {
-               r = pItem->AddElement(Rectangle(16, 28,72, 72), IDA_FORMAT_ICON, *pBitmap, null);
+               r = pItem->AddElement(Rectangle(16, 28 + (__fontSize - 44)/2,72, 72), IDA_FORMAT_ICON, *pBitmap, null);
                delete pBitmap;
                if (IsFailed(r))
                {
@@ -601,17 +602,17 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        bookmarkBtnWidth = 64;
 
 
-       r = pItem->AddElement(Rectangle(104, 10, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 60), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), 44,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+       r = pItem->AddElement(Rectangle(104, 10, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 60 - 44 + __fontSize), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), __fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
        TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
 
 //     if(__pSearchBar->GetMode() == SEARCH_BAR_MODE_INPUT)
 //             r = pItem->AddElement(Rectangle(104, 70, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 //     else
-               r = pItem->AddElement(Rectangle(104, 70, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+               r = pItem->AddElement(Rectangle(104, 70 - 44 +__fontSize, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
        TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
        if ( pBookmarkBitmap != null)
        {
-               r = pItem->AddElement(Rectangle(GetClientAreaBounds().width - bookmarkBtnWidth - 16, (128 - pBookmarkBitmap->GetHeight())/2, bookmarkBtnWidth, bookmarkBtnWidth), IDA_FORMAT_BOOKMARK, *pBookmarkBitmap);
+               r = pItem->AddElement(Rectangle(GetClientAreaBounds().width - bookmarkBtnWidth - 16, (128 - pBookmarkBitmap->GetHeight())/2 +(__fontSize - 44)/2, bookmarkBtnWidth, bookmarkBtnWidth), IDA_FORMAT_BOOKMARK, *pBookmarkBitmap);
                TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
                delete pBookmarkBitmap;
        }
@@ -1138,6 +1139,7 @@ HistoryListForm::OnKeypadActionPerformed(Control &source, KeypadAction keypadAct
                __pSearchListView->SetEnabled(true);
                __searchHistory = true;
                __searchText =__pSearchBar->GetText();
+               AppLog("SearchTextHistory %S errormsg %s",__searchText.GetPointer(),GetErrorMessage(GetLastResult()));
 
                r = __pGroupedListView->SetShowState(false);
                if (IsFailed(r))
index 8731acf..2ba1b68 100644 (file)
@@ -143,7 +143,7 @@ InternetApp::OnAppInitialized(void)
 
        if (__pNewWindowInfo == null)//if the application is launched normally
        {
-               __pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene(homePage);
+               __pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN(homePage);
        }
 
        if (__pNewWindowInfo == null)
@@ -289,7 +289,7 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
 
                if (__pNewWindowInfo == null)
                {
-                       __pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene(urlData, true);
+                       __pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN(urlData, true);
                }
                if (__pNewWindowInfo == null)
                {
index f23c0ac..0c391c4 100644 (file)
@@ -208,6 +208,7 @@ MainForm::MainForm(void)
        __pClearBtn = null;
        __pReaderBtn = null;
        __isWebKeypadOpened = false;
+       __fontSize = 44;
 }
 
 MainForm::~MainForm(void)
@@ -270,6 +271,7 @@ MainForm::OnInitializing(void)
        const int WIDTH_CONTEXT_MENU_BUTTON = 336;
        const int HEIGHT_CONTEXT_MENU_BUTTON = 72;
 
+       __fontSize = CommonUtil::GetFontSize();
        Panel* pFooterPanel = null;
 
        __pSaveImage = new Image();
@@ -1137,7 +1139,7 @@ MainForm::CreateItem (int index, int itemWidth)
        Rectangle screenBounds = GetBounds();
        if (pItem != null)
        {
-               r = pItem->Construct(Dimension(itemWidth, 128), style);
+               r = pItem->Construct(Dimension(itemWidth, 128 + (__fontSize - 44)), style);
        }
        if (IsFailed(r))
        {
@@ -1162,8 +1164,8 @@ MainForm::CreateItem (int index, int itemWidth)
 
        if ( pListIconImage != NULL)
        {
-               listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28,72, 72);
-               pagetTitleRect.SetBounds(listImageRect.x + 72 + 16,10, screenBounds.width - 2 * pListIconImage->GetWidth() - 120, 60);
+               listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28  + (__fontSize - 44)/2 , 72, 72);
+               pagetTitleRect.SetBounds(listImageRect.x + 72 + 16,10, screenBounds.width - 2 * pListIconImage->GetWidth() - 120, 60  + (__fontSize - 44));
                pageURLRect.SetBounds(pagetTitleRect.x, pagetTitleRect.y + pagetTitleRect.height, screenBounds.width - 2 * pListIconImage->GetWidth() - 120, 48);
 
 
@@ -1177,7 +1179,7 @@ MainForm::CreateItem (int index, int itemWidth)
        {
                if (pItem != null)
                {
-                       pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, 44, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
+                       pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, __fontSize, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
                }
        }
 
@@ -1817,7 +1819,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_NEWWINDOWBTN_CLICKED:
        {
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
                if (pNewWindowInfo == null)
                {
@@ -2080,7 +2082,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        String srcUrl = __pHitElementResult->GetUrl();
 
-                       WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene(srcUrl);
+                       WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN(srcUrl);
 
                        if (pNewWindowInfo == null)
                        {
@@ -2210,6 +2212,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_SHARE_TEXT_CLICKED:
        {
+               __pWebViewer->ReleaseBlock();
                AppLogDebug("IDA_SHARE_TEXT_CLICKED");
                if(__pPopUp != null)
                {
@@ -2320,7 +2323,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                String url = __pFooterUrlField->GetText();
                AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
-               LoadUrl(url);
+//             LoadUrl(url);
+               __pWebViewer->Reload();
+               if (__pAddressbar != null)
+               {
+                       //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+                       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+               }
 
                //OnUrlSubmitted();
                UpdateProgressBitmap();
@@ -2425,10 +2434,10 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        // hiding the address bar
        //      __pAddressbar->SetBounds(__pAddressbar->GetX(), __pAddressbar->GetY() - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
        __pAddressbar->SetShowState(false);
-       if(__pWebViewer != null)
-       {
-               __pWebViewer->Resume();
-       }
+//     if(__pWebViewer != null)
+//     {
+//             __pWebViewer->Resume();
+//     }
 
        if(pUrl != null && pUrl->GetLength() > 0)
        {
@@ -2535,6 +2544,7 @@ MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
        if (__pWebViewer != null)
        {
                pWebCanvas = __pWebViewer->GetCanvasN();
+
        }
        if (pWebCanvas == null)
        {
@@ -3293,6 +3303,7 @@ MainForm::OnAddressBarKeypadBoundsChanged(const Addressbar& addBar)
 void
 MainForm::OnPageTitleReceived(const Tizen::Base::String& title)
 {
+       AppLog("MainForm::OnPageTitleReceived");
        if (__pWindowInfo)
        {
                __pWindowInfo->pageTitle = title;
@@ -3515,12 +3526,13 @@ MainForm::OnWebPageBlockSelected(Tizen::Web::Controls::Web& source, Tizen::Graph
                String tagName = __pHitElementResult->GetTagName();
                String type = __pHitElementResult->GetAttributeValue("type");
 
+
                __currentSelectedStr.Clear();
                AppLog("__currentSelectedStr after clear %ls",__currentSelectedStr.GetPointer());
                __currentSelectedStr = __pWebViewer->GetTextFromBlock();
                AppLog("__currentSelectedStr after GetTextFromBlock %ls",__currentSelectedStr.GetPointer());
 
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) /*&& __isLongPressedDone == true*/)
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) /*&& __isLongPressedDone == true*/ && __currentSelectedStr.CompareTo(L"") !=0)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -3560,7 +3572,7 @@ MainForm::OnWebPageShowRequested(Tizen::Web::Controls::Web& source)
 Web*
 MainForm::OnWebWindowCreateRequested(void)
 {
-       WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+       WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
        if (pNewWindowInfo == null)
        {
@@ -3962,6 +3974,12 @@ MainForm::OnWebKeypadClosed(Tizen::Web::Controls::Web& source)
 }
 
 void
+MainForm::OnWebKeypadBoundsChanged(Tizen::Web::Controls::Web& source)
+{
+//     RelativeLayout(false);
+}
+
+void
 MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
 {
        Control* temp = const_cast< Control* >(&source);
@@ -4041,9 +4059,12 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
                AppLog("tag name is %ls", tagName.GetPointer());
                AppLog("type is %ls", type.GetPointer());
-               AppLog("innerHtml is %ls", innerHtml.GetPointer());
 
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0 && __isWebKeypadOpened == true)
+
+
+               //__isLongPressedDone = true;
+               result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0 && __isWebKeypadOpened == true && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -4055,8 +4076,6 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                                __pImageMenu->Invalidate(true);
                        }
                }
-               //__isLongPressedDone = true;
-               result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
                AppLog("setselectionselectedornot %s",GetErrorMessage(r));
 
        }
@@ -4300,11 +4319,11 @@ MainForm::OnSettingsChange(int settingvalue)
        if (settingvalue == (int) REGISTRY_SETTING_DEFAULT_VIEW)
        {
                WebSetting settings = __pWebViewer->GetSetting();
-               if (SettingPresentationModel::GetInstance()->GetDefaultView().CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_FIT_TO_WIDTH")) == 0)
+               if (SettingPresentationModel::GetInstance()->GetDefaultView().CompareTo((L"IDS_BR_BODY_FIT_TO_WIDTH")) == 0)
                {
                        settings.SetAutoFittingEnabled(true);
                }
-               else if (SettingPresentationModel::GetInstance()->GetDefaultView().CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_READABLE")) == 0)
+               else if (SettingPresentationModel::GetInstance()->GetDefaultView().CompareTo((L"IDS_BR_BODY_READABLE")) == 0)
                {
                        settings.SetAutoFittingEnabled(false);
                }
@@ -4321,6 +4340,7 @@ MainForm::OnSettingsChange(int settingvalue)
                WebSetting settings = __pWebViewer->GetSetting();
                settings.SetAutoImageLoadEnabled(SettingPresentationModel::GetInstance()->IsDisplayImagesEnabled());
                __pWebViewer->SetSetting(settings);
+               __pWebViewer->Reload();
        }
        else if (settingvalue == (int) REGISTRY_SETTING_BLOCK_POPUP)
        {
@@ -5065,6 +5085,8 @@ AddressBarMode MainForm::GetAddressbarMode(void)
 void MainForm::SetUrl(const String& url)
 {
        __displayUrl = url;
+       if(__displayUrl.GetLength() > 2048)
+               __displayUrl.SubString(0,2048,__displayUrl);
 
        if (__pFooterUrlField != NULL)
        {
@@ -5072,20 +5094,20 @@ void MainForm::SetUrl(const String& url)
                if (removedHttpUrl.IsEmpty() == false)
                {
                        __pFooterUrlField->SetText(removedHttpUrl);
-                       if(__pAddressbar != NULL)
-                       __pAddressbar->SetUrl(__displayUrl);
+                       if(__pAddressbar != NULL && __pAddressbar->HasCurrentFocus() == false)
+                               __pAddressbar->SetUrl(__displayUrl);
                }
                else
                {
                        __pFooterUrlField->SetText(__displayUrl);
-                       if(__pAddressbar != NULL)
-                       __pAddressbar->SetUrl(__displayUrl);
+                       if(__pAddressbar != NULL && __pAddressbar->HasCurrentFocus() == false)
+                               __pAddressbar->SetUrl(__displayUrl);
                }
                if(__pFooterUrlField)
                        __pFooterUrlField->SetCursorPosition(__pFooterUrlField->GetTextLength());
                __pFooterUrlField->Invalidate(false);
-               if(__pAddressbar != NULL)
-               __pAddressbar->Invalidate(true);
+               if(__pAddressbar != NULL && __pAddressbar->HasFocus())
+                       __pAddressbar->Invalidate(true);
 //             __pFooterUrlField->SetCursorPosition(0);
        }
 }
index 3160b61..5d5adf2 100644 (file)
@@ -48,6 +48,7 @@ MultipleWindowForm::MultipleWindowForm(void)
 {
        __startPosition.x = -1;
        __startPosition.y = -1;
+       __fontSize = 44;
 }
 
 MultipleWindowForm::~MultipleWindowForm(void)
@@ -87,6 +88,7 @@ MultipleWindowForm::OnInitializing(void)
        FooterItem closeButton;
        FooterItem newButton;
 
+       __fontSize = CommonUtil::GetFontSize();
        SceneManager* pSceneManager = SceneManager::GetInstance();
 
        if (pSceneManager == null)
@@ -203,7 +205,7 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
        {
        case IDA_BUTTON_NEW:
        {
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
                if (pNewWindowInfo == null)
                {
@@ -297,7 +299,7 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
                }
                pAllWindowList->RemoveAll(true);
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
                if (pNewWindowInfo == null)
                {
@@ -536,7 +538,7 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
        }
 
        Rectangle screenBounds = GetBounds();
-       r = pItem->Construct(Dimension(itemWidth, 128), style);
+       r = pItem->Construct(Dimension(itemWidth, 128 + (__fontSize - 44)), style);
        if (IsFailed(r))
        {
                return NULL;
@@ -566,18 +568,18 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
        }
 
 
-       listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28,width, 72);
-       pagetTitleRect.SetBounds(listImageRect.x + width + 16,10, screenBounds.width - 2 * width - 24 - 64, 60);
+       listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28 + (__fontSize - 44)/2,width, 72  );
+       pagetTitleRect.SetBounds(listImageRect.x + width + 16,10, screenBounds.width - 2 * width - 24 - 64, 60 + (__fontSize - 44));
        pageURLRect.SetBounds(pagetTitleRect.x, pagetTitleRect.y + pagetTitleRect.height, screenBounds.width - 2 * width - 120, 48);
        if(__pListDeleteImage != null)
        {
-               deleteImageRect.SetBounds(screenBounds.width - __pListDeleteImage->GetWidth() - 24, (128 - __pListDeleteImage->GetHeight() - 8)/2, __pListDeleteImage->GetWidth() + 8, __pListDeleteImage->GetHeight() + 8);
+               deleteImageRect.SetBounds(screenBounds.width - __pListDeleteImage->GetWidth() - 24, (128 + (__fontSize - 44) - __pListDeleteImage->GetHeight() - 8)/2, __pListDeleteImage->GetWidth() + 8, __pListDeleteImage->GetHeight() + 8);
        }
        pItem->AddElement(listImageRect, IDA_FORMAT_BITMAP, *__pListIconImage, null, null);
 
        if (pageTitle.CompareTo(L"") != 0)
        {
-               pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, 44, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
+               pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, __fontSize, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
        }
 
        if (pageURL.CompareTo(L"") != 0)
index baaf8db..13910c7 100644 (file)
@@ -201,7 +201,7 @@ MultipleWindowPresentationModel::SetValue(Key key, Object* value)
 }
 
 WindowInfo*
-MultipleWindowPresentationModel::CreateNewMainViewScene(const String& Url, bool isAppControlTriggered)
+MultipleWindowPresentationModel::CreateNewMainViewSceneN(const String& Url, bool isAppControlTriggered)
 {
 
        if (GetInstance()->GetAllWindowArrayList()->GetCount() >= 9)
index 54d5b87..b8d496d 100644 (file)
@@ -52,6 +52,7 @@ SettingForm::SettingForm(void)
        __currentURL = L"";
        __pList = null;
        InitializeSettingValues();
+       __fontSize = 44;
 }
 
 SettingForm::~SettingForm(void)
@@ -255,6 +256,8 @@ SettingForm::OnInitializing(void)
        Footer* pFooter = NULL;
        SceneManager* pSceneManager = NULL;
 
+       __fontSize = CommonUtil::GetFontSize();
+
        __pList = static_cast< GroupedListView* >(GetControl(L"IDC_SETTING_LIST"));
        if ( __pList != NULL )
        {
index 047b2d8..1b83d52 100644 (file)
@@ -83,6 +83,14 @@ SettingPresentationModel::SetDefaultValues(void)
        __setting.SetAutoFormDataShowEnabled(__rememberFormData);
        __setting.SetAutoLoginFormFillEnabled(__rememberPassword);
 
+       if (__defaultViewLevel.CompareTo((L"IDS_BR_BODY_FIT_TO_WIDTH")) == 0)
+       {
+               __setting.SetAutoFittingEnabled(true);
+       }
+       else if (__defaultViewLevel.CompareTo((L"IDS_BR_BODY_READABLE")) == 0)
+       {
+               __setting.SetAutoFittingEnabled(false);
+       }
        if (__securityWarnings == true)
        {
                __setting.SetCertificateErrorHandlingMode(WEB_CERTIFICATE_ERROR_HANDLING_MODE_USER_CONFIRM);
@@ -456,11 +464,11 @@ SettingPresentationModel::SetDefaultView(const String& viewLevel)
 {
        __defaultViewLevel = viewLevel;
        //CommonUtil::GetString(L"IDS_FIT_TO_WIDTH")
-       if (__defaultViewLevel.CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_FIT_TO_WIDTH")) == 0)
+       if (__defaultViewLevel.CompareTo((L"IDS_BR_BODY_FIT_TO_WIDTH")) == 0)
        {
                __setting.SetAutoFittingEnabled(true);
        }
-       else if (__defaultViewLevel.CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_READABLE")) == 0)
+       else if (__defaultViewLevel.CompareTo((L"IDS_BR_BODY_READABLE")) == 0)
        {
                __setting.SetAutoFittingEnabled(false);
        }
index 5a79c39..a7294b8 100644 (file)
@@ -33,11 +33,13 @@ using namespace Tizen::App;
 using namespace Tizen::Io;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Base::Runtime;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+
 const int SharePopup::IDA_CANCEL_BUTTON = 101;
 const int SharePopup::ID_FORMAT_MESSAGE_STRING = 500;
 const int SharePopup::ID_FORMAT_EMAIL_STRING = 501;
@@ -47,7 +49,6 @@ const int SharePopup::ID_FORMAT_TWITTER_STRING = 503;
 ShareInfo::    ShareInfo(void)
 {
        isImageAttached = false;
-
 }
 
 ShareInfo::    ~ShareInfo(void)
@@ -110,6 +111,7 @@ SharePopup::SharePopup(void)
 :__pList(null),__pShareList(null)
 {
        __appControlOngoing = false;
+       __pTimer = null;
 }
 
 SharePopup::~SharePopup(void)
@@ -144,6 +146,8 @@ SharePopup::Initialize(void)
                pCancelButton->SetActionId(IDA_CANCEL_BUTTON);
        }
 
+       __pTimer = new(std::nothrow) Timer();
+       __pTimer->Construct(*this);
        return true;
 }
 
@@ -155,6 +159,13 @@ SharePopup::OnTerminating(void)
 }
 
 void
+SharePopup::OnTimerExpired(Timer& timer)
+{
+       Popup::SetShowState(false);
+       Popup::Show();
+}
+
+void
 SharePopup::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        switch(actionId)
@@ -189,6 +200,7 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via message
                        StartMessageAppControl();
+                       __pTimer->Start(1000);
                }
        }
        break;
@@ -199,6 +211,7 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via email
                        StartEmailAppControl();
+                       __pTimer->Start(1000);
                }
 
        }