Fixed Nabi issue N_SE-40542,N_SE-39949,N_SE-40229
authorrahul.dutt <rahul.dutt@samsung.com>
Fri, 7 Jun 2013 10:20:23 +0000 (15:50 +0530)
committerrahul.dutt <rahul.dutt@samsung.com>
Fri, 7 Jun 2013 10:20:23 +0000 (15:50 +0530)
Change-Id: Ie4862d79c5d3f886eaeb8cefaa7d4860b9074a74

inc/IntMainForm.h
res/screen-size-normal/IDL_FIND_ON_PAGE.xml
res/screen-size-normal/IDL_NOTIFICATION_PANEL.xml
src/IntAddBookmarkForm.cpp
src/IntEditHistoryListForm.cpp
src/IntMainForm.cpp
src/IntSettingPresentationModel.cpp

index 7ba1263..6c983e9 100644 (file)
@@ -335,10 +335,18 @@ private:
        Tizen::Ui::Controls::Panel* __pArticleReaderPanel;
        Tizen::Ui::Controls::Panel* __pBlankPanel;
        Tizen::Ui::Controls::Label *    __pFindWordBgLabel;
+       Tizen::Ui::Controls::Label *    __pFindWordBgLabelRightToLeft;
        Tizen::Ui::Controls::Button*    __pFindWordClear;
+       Tizen::Ui::Controls::Button*    __pFindWordClearRightToLeft;
        Tizen::Ui::Controls::Label*     __pFindWordCountLabel;
+       Tizen::Ui::Controls::Label*     __pFindWordCountLabelRightToLeft;
        Tizen::Ui::Controls::Panel*     __pFindWordControl;
+
+       Tizen::Ui::Controls::Panel*     __pFindWordPanelLeftToRight;
+       Tizen::Ui::Controls::Panel*     __pFindWordPanelRightToLeft;
+
        Tizen::Ui::Controls::EditField* __pFindWordEditField;
+       Tizen::Ui::Controls::EditField* __pFindWordEditFieldRightToLeft;
        Tizen::Ui::Controls::Button*    __pFindWordNext;
        Tizen::Ui::Controls::Button*    __pFindWordPrev;
 //     Tizen::Ui::Controls::Panel*     __pFindWordPanel;
index 95fd15d..d16f92e 100644 (file)
@@ -3,8 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-
-<ScenePanel Bversion="2.0.0.201305162056" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201305311836" Dversion="20120315">
     <Panel id="IDL_FIND_ON_PAGE">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="82.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="3.0" y="27.0"/>
     </Button>
     <Label id="IDC_FIND_COUNT_LABEL" parent="IDC_PANEL1">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="" textColor="#4E4945" textSize="22.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_CLEAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="80.0" x="218.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_CLEAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="124.0" x="174.0" y="0.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FIND_CLEAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="671.0" y="0.0"/>
     </Label>
     <EditField id="IDC_FIND_WORD_EDITFIELD" parent="IDC_PANEL1">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_COUNT_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="218.0" x="0.0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_COUNT_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="174.0" x="0.0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FIND_COUNT_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="671.0" x="0.0" y="0.0"/>
     </EditField>
+    <Panel id="IDC_PANEL2" parent="IDL_FIND_ON_PAGE">
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FIND_NEXT" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_CANCEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="370.0" x="191.0" y="5.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FIND_NEXT" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="5.0" mode="Landscape" rightRelation="IDC_FIND_CANCEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_FIND_ON_PAGE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="923.0" x="191.0" y="5.0"/>
+    </Panel>
+    <Label id="IDC_LABEL2" parent="IDC_PANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="IDC_PANEL2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_PANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_PANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="370.0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.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="923.0" x="0" y="0.0"/>
+    </Label>
+    <EditField id="IDC_FIND_WORD_EDITFIELD2" parent="IDC_PANEL2">
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_PANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="174.0" x="196.0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_PANEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="671.0" x="252.0" y="0.0"/>
+    </EditField>
+    <Label id="IDC_FIND_COUNT_LABEL2" parent="IDC_PANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="" textColor="#4E4945" textSize="22.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="124.0" x="72.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="72.0" y="0.0"/>
+    </Label>
+    <Button id="IDC_FIND_CLEAR2" parent="IDC_PANEL2">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#4D4D4D" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="0.0" y="0.0"/>
+    </Button>
 </ScenePanel>
index 1998a37..9246bd7 100644 (file)
@@ -3,16 +3,15 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-
-<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201305162056" Dversion="20120315">
     <Panel id="IDL_NOTIFICATION_PANEL">
         <property backgroundColor="#444444" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout height="54" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="4" y="113"/>
-        <layout height="48" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="30" y="538"/>
+        <layout height="54.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="113.0"/>
+        <layout height="48.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="538.0"/>
     </Panel>
     <Label id="IDC_NOTIFICATION_LABEL" parent="IDL_NOTIFICATION_PANEL">
-        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="" textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_NOTIFICATION_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_NOTIFICATION_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_NOTIFICATION_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="0" x="0" y="0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="" textColor="#FFFFFF" textSize="32.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_NOTIFICATION_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_NOTIFICATION_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_NOTIFICATION_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>
     </Label>
 </ScenePanel>
index d51298a..728cdf5 100644 (file)
@@ -937,10 +937,20 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                {
                        __selectedIndex = __folderCount + 1;
                }
-
+               if(__selectedIndex > 1)
+               {
+                       String parentID = L"0";
+                       ArrayList folderList;
+                       BookmarkData* pBookmark = null;
+                       BookmarkPresentationModel::GetInstance()->GetFolder(parentID, 0, __folderCount, folderList);
+                       pBookmark = static_cast<BookmarkData*>(folderList.GetAt(__selectedIndex-2));
+                       if(pBookmark != null)
+                       {
+                               __folderName = pBookmark->GetBookmarkTitle();
+                       }
+               }
        }
 
-
        if (__view == CommonUtil::GetString(L"IDS_COM_SK_ADD")  && previousSceneId == IDSCN_CREATE_BOOKMARK_FOLDER)
        {
 
index df9012b..a6b1f1f 100644 (file)
@@ -604,7 +604,16 @@ EditHistoryListForm::GetGroupCount(void)
        CreateGroupItems();
 
        int count = 0;
-       HistoryPresentationModel::GetInstance()->GetHistoryCount(count);
+       //HistoryPresentationModel::GetInstance()->GetHistoryCount(count);
+
+       DateTime startTime;
+       startTime.SetValue(0, 1, 1, 0, 0, 0);
+       DateTime endTime;
+       SystemTime::GetCurrentTime(endTime);
+       endTime.SetValue(endTime.GetYear(), endTime.GetMonth(), endTime.GetDay(), 23,59,59);
+
+       r = HistoryPresentationModel::GetInstance()->GetHistoryCountWithTimeRange(startTime ,endTime, count);
+
        if(count == 0)
        {
                __isNoHistoryPresent = false;
index 4b78391..f23c0ac 100644 (file)
@@ -125,6 +125,8 @@ const int IDA_HYPERLINK_COPY_LINK_CLICKED = 221;
 const int IDA_HYPERLINK_SAVE_IMAGE_CLICKED = 222;
 const int IDA_HYPERLINK_SHARE_IMAGE_CLICKED = 223;
 
+const int IDA_FINDWORD_CLEAR_RIGHT_TO_LEFT_CLICKED = 224;
+
 const int DEFAULT_PROGRESS_PERCENTAGE = 10;
 
 const int MainForm::IDA_FORMAT_BITMAP = 500;
@@ -151,11 +153,16 @@ MainForm::MainForm(void)
        __pImageMenu = null;
        __pMenu = null;
        __pFindWordControl = null;
-
+       __pFindWordPanelLeftToRight = null;
+       __pFindWordPanelRightToLeft = null;
        __pFindWordBgLabel = null;
+       __pFindWordBgLabelRightToLeft = null;
        __pFindWordEditField = null;
+       __pFindWordEditFieldRightToLeft = null;
        __pFindWordClear = null;
+       __pFindWordClearRightToLeft = null;
        __pFindWordCountLabel = null;
+       __pFindWordClearRightToLeft = null;
        __pFindWordNext = null;
        __pFindWordPrev = null;
        __previousZoomLevel = 1.0;
@@ -929,6 +936,15 @@ MainForm::InitFindWordPanel(void)
                                delete pBitmap;
                        }
                }
+               if (__pFindWordBgLabelRightToLeft != null)
+               {
+                       Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_FINDWORD_INPUT_FIELD_BG, __pFindWordBgLabelRightToLeft->GetWidth(), __pFindWordBgLabelRightToLeft->GetHeight());
+                       if (pBitmap != null)
+                       {
+                               __pFindWordBgLabelRightToLeft->SetBackgroundBitmap(*pBitmap);
+                               delete pBitmap;
+                       }
+               }
                return r;
        }
 
@@ -945,6 +961,12 @@ MainForm::InitFindWordPanel(void)
        __pFindWordControl->SetShowState(false);
        __pFindWordControl->Invalidate(false);
 
+       __pFindWordPanelLeftToRight = static_cast<Panel*>(__pFindWordControl->GetControl(L"IDC_PANEL1", true));
+       __pFindWordPanelLeftToRight->SetShowState(true);
+
+       __pFindWordPanelRightToLeft = static_cast<Panel*>(__pFindWordControl->GetControl(L"IDC_PANEL2", true));
+       __pFindWordPanelRightToLeft->SetShowState(false);
+
        __pFindWordBgLabel = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_LABEL1", true));
        if (__pFindWordBgLabel != null)
        {
@@ -965,6 +987,26 @@ MainForm::InitFindWordPanel(void)
                }
        }
 
+       __pFindWordBgLabelRightToLeft = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_LABEL2", true));
+               if (__pFindWordBgLabelRightToLeft != null)
+               {
+                       Panel* pPanel1 = static_cast<Panel*>(__pFindWordControl->GetControl(L"IDC_PANEL1", true));
+                       Rectangle pRect = pPanel1->GetBounds();
+                       pRect.x = pRect.y = 0;
+                       __pFindWordBgLabelRightToLeft->SetBounds(pRect);
+                       Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(L"I01_search_input_field_bg.9.png", __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight());
+                       if (pBitmap != null)
+                       {
+                               AppLogDebug("InitFindWordPanel: Coming here");
+                               __pFindWordBgLabelRightToLeft->SetBackgroundBitmap(*pBitmap);
+                               delete pBitmap;
+                       }
+                       else
+                       {
+                               AppLogDebug("InitFindWordPanel: shouldn't Come here");
+                       }
+               }
+
        Button* pfindWordCancel = null;
        pfindWordCancel = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_CANCEL", true));
        if (pfindWordCancel == null)
@@ -982,9 +1024,19 @@ MainForm::InitFindWordPanel(void)
                return E_FAILURE;
        }
 
+       __pFindWordClearRightToLeft = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_CLEAR2", true));
+               if (__pFindWordClearRightToLeft == null)
+               {
+                       AppLogException("There is some problem in the xml file. Please check.");
+                       return E_FAILURE;
+               }
+
        __pFindWordClear->SetActionId(IDA_FINDWORD_CLEAR_CLICKED);
        __pFindWordClear->AddActionEventListener(*this);
 
+       __pFindWordClearRightToLeft->SetActionId(IDA_FINDWORD_CLEAR_RIGHT_TO_LEFT_CLICKED);
+       __pFindWordClearRightToLeft->AddActionEventListener(*this);
+
        __pFindWordNext = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_NEXT", true));
        if (__pFindWordNext == null)
        {
@@ -1015,6 +1067,13 @@ MainForm::InitFindWordPanel(void)
                return E_FAILURE;
        }
 
+       __pFindWordCountLabelRightToLeft = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_FIND_COUNT_LABEL2", true));
+       if (__pFindWordCountLabel == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+
        __pFindWordEditField = static_cast<EditField*>(__pFindWordControl->GetControl(L"IDC_FIND_WORD_EDITFIELD", true));
        if (__pFindWordEditField == null)
        {
@@ -1025,6 +1084,16 @@ MainForm::InitFindWordPanel(void)
        __pFindWordEditField->AddKeypadEventListener(*this);
        __pFindWordEditField->SetOverlayKeypadCommandButtonVisible(false);
 
+       __pFindWordEditFieldRightToLeft = static_cast<EditField*>(__pFindWordControl->GetControl(L"IDC_FIND_WORD_EDITFIELD2", true));
+       if (__pFindWordEditFieldRightToLeft == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+       __pFindWordEditFieldRightToLeft->AddTextEventListener(*this);
+       __pFindWordEditFieldRightToLeft->AddKeypadEventListener(*this);
+       __pFindWordEditFieldRightToLeft->SetOverlayKeypadCommandButtonVisible(false);
+
        return r;
 }
 
@@ -1378,8 +1447,18 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pMenu->SetShowState(false);
                __pMenu->Invalidate(false);
 
-               __pFindWordEditField->SetFocus();
                ShowFindWordPanel(true);
+
+               if(__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
+               {
+                       __pFindWordEditField->SetFocus();
+                       __pFindWordCountLabel->SetShowState(false);
+               }
+               else
+               {
+                       __pFindWordEditFieldRightToLeft->SetFocus();
+                       __pFindWordCountLabelRightToLeft->SetShowState(false);
+               }
        }
        break;
        case IDA_PRIVATEON_CLICKED:
@@ -1834,6 +1913,20 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __currentSearchStr = L"";
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
+               __pFindWordCountLabel->SetShowState(false);
+               __pFindWordControl->Invalidate(true);
+       }
+       break;
+       case IDA_FINDWORD_CLEAR_RIGHT_TO_LEFT_CLICKED:
+       {
+               __pFindWordCountLabelRightToLeft->SetText(L"0/0");
+               __pFindWordEditFieldRightToLeft->SetText(L"");
+               __currentSearchStr = L"aaaaaabbbbbbccccccc";
+               StartWordSearch();
+               __currentSearchStr = L"";
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordCountLabelRightToLeft->SetShowState(false);
                __pFindWordControl->Invalidate(true);
        }
        break;
@@ -2442,8 +2535,6 @@ MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
        if (__pWebViewer != null)
        {
                pWebCanvas = __pWebViewer->GetCanvasN();
-               __pWebViewer->Pause();
-
        }
        if (pWebCanvas == null)
        {
@@ -3552,12 +3643,50 @@ MainForm::ShowFindWordPanel(bool show , bool isTouchPressed)
        {
                return;
        }
+
+       Tizen::Locales::LocaleManager localeManager;
+       Tizen::Locales::Locale local = localeManager.GetSystemLocale();
+
+       String languageCode;
+       result r = SettingInfo::GetValue(L"Language", languageCode);
+       // int languagecode = local.GetLanguageCode();
+       AppLog("rahul language is %S", languageCode.GetPointer());
+
        if (show == true)
        {
                InitFindWordPanel();
-//             __pFindWordEditField->SetText(__currentSearchStr);
-               //__pFindWordCountLabel->SetText(L"");
-//             __pFindWordCountLabel->SetText(L"0/0");
+
+               if (languageCode.CompareTo("ara") == 0)
+               {
+                       AppLog("rahul language is arabic");
+
+                       __pFindWordPanelLeftToRight->SetShowState(false);
+                       __pFindWordPanelRightToLeft->SetShowState(true);
+
+                       __pFindWordClear->SetShowState(false);
+                       __pFindWordCountLabel->SetShowState(false);
+                       __pFindWordEditField->SetShowState(false);
+
+                       __pFindWordClearRightToLeft->SetShowState(true);
+                       __pFindWordCountLabelRightToLeft->SetShowState(true);
+                       __pFindWordEditFieldRightToLeft->SetShowState(true);
+               }
+               else
+               {
+                       AppLog("rahul language is not arabic");
+
+
+                       __pFindWordPanelLeftToRight->SetShowState(true);
+                       __pFindWordPanelRightToLeft->SetShowState(false);
+
+                       __pFindWordClear->SetShowState(true);
+                       __pFindWordCountLabel->SetShowState(true);
+                       __pFindWordEditField->SetShowState(true);
+
+                       __pFindWordClearRightToLeft->SetShowState(false);
+                       __pFindWordCountLabelRightToLeft->SetShowState(false);
+                       __pFindWordEditFieldRightToLeft->SetShowState(false);
+               }
                __pFindWordControl->SetShowState(true);
        }
        else
@@ -3571,16 +3700,35 @@ MainForm::ShowFindWordPanel(bool show , bool isTouchPressed)
        AppLog("MainForm::ShowFindWordPanel %d",show);
        if (show && !isTouchPressed)
        {
-               if (__pFindWordEditField)
+               if (languageCode.CompareTo("ara") == 0)
                {
-                       __pFindWordEditField->SetFocus();
-                       __pFindWordEditField->ShowKeypad();
+                       if (__pFindWordEditFieldRightToLeft)
+                       {
+                               __pFindWordEditFieldRightToLeft->SetFocus();
+                               __pFindWordEditFieldRightToLeft->ShowKeypad();
+                       }
+               }
+               else
+               {
+                       if (__pFindWordEditField)
+                       {
+                               __pFindWordEditField->SetFocus();
+                               __pFindWordEditField->ShowKeypad();
+                       }
                }
        }
        else
        {
-               if (__pFindWordEditField)
-                       __pFindWordEditField->HideKeypad();
+               if (languageCode.CompareTo("ara") == 0)
+               {
+                       if (__pFindWordEditFieldRightToLeft)
+                               __pFindWordEditFieldRightToLeft->HideKeypad();
+               }
+               else
+               {
+                       if (__pFindWordEditField)
+                               __pFindWordEditField->HideKeypad();
+               }
        }
 
        RelayoutControls(false);
@@ -3639,10 +3787,19 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                AppLog("Word not found");
                //Show error notification to user
                __pFindWordNext->SetEnabled(false);
-               __pFindWordCountLabel->SetText(L"0/0");
+               if(__pFindWordCountLabel && __pFindWordCountLabel->GetShowState() == true)
+               {
+                       __pFindWordCountLabel->SetText(L"0/0");
+                       __pFindWordCountLabel->Invalidate(false);
+               }
+               else if(__pFindWordCountLabelRightToLeft && __pFindWordCountLabelRightToLeft->GetShowState() == true)
+               {
+                       __pFindWordCountLabelRightToLeft->SetText(L"0/0");
+                       __pFindWordCountLabelRightToLeft->Invalidate(false);
+               }
                __pFindWordNext->Invalidate(false);
                __pFindWordPrev->Invalidate(false);
-               __pFindWordCountLabel->Invalidate(false);
+
                return;
        }
 
@@ -3659,15 +3816,23 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
        countStr.Append(__currentWordIndex);
        countStr.Append(L"/");
        countStr.Append(__maxOccurrances);
+       if (__pFindWordCountLabel && __pFindWordCountLabel->GetShowState() == true)
+       {
        __pFindWordCountLabel->SetText(countStr);
-       //      __pFindWordCountLabel->SetShowState(true);
        __pFindWordCountLabel->Invalidate(false);
-
+       __pFindWordCountLabel->Invalidate(false);
+       }
+       else if(__pFindWordCountLabelRightToLeft && __pFindWordCountLabelRightToLeft->GetShowState() == true)
+       {
+               __pFindWordCountLabelRightToLeft->SetText(countStr);
+               __pFindWordCountLabelRightToLeft->Invalidate(false);
+               __pFindWordCountLabelRightToLeft->Invalidate(false);
+       }
        //FindNextWord(true);
        //Update the controls
        __pFindWordNext->Invalidate(false);
        __pFindWordPrev->Invalidate(false);
-       __pFindWordCountLabel->Invalidate(false);
+
 }
 
 void
@@ -3700,9 +3865,18 @@ MainForm::FindNextWord(bool next)
        countStr.Append(__currentWordIndex);
        countStr.Append(L"/");
        countStr.Append(__maxOccurrances);
+
+       if (__pFindWordCountLabel && __pFindWordCountLabel->GetShowState() == true)
+       {
        __pFindWordCountLabel->SetText(countStr);
-       //      __pFindWordCountLabel->SetShowState(true);
        __pFindWordCountLabel->Invalidate(false);
+       }
+       else if(__pFindWordCountLabelRightToLeft && __pFindWordCountLabelRightToLeft->GetShowState() == true)
+       {
+               __pFindWordCountLabelRightToLeft->SetText(countStr);
+               __pFindWordCountLabelRightToLeft->Invalidate(false);
+       }
+
        if (__currentWordIndex >= __maxOccurrances)
        {
                __pFindWordNext->SetEnabled(false);
@@ -3721,7 +3895,7 @@ MainForm::FindNextWord(bool next)
        }
        __pFindWordPrev->Invalidate(false);
        __pFindWordNext->Invalidate(false);
-       __pFindWordCountLabel->Invalidate(false);
+
        __pFindWordControl->Invalidate(true);
 }
 
@@ -3922,13 +4096,27 @@ MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEven
                __currentSearchStr = L"";
                __currentWordIndex = 0;
                __maxOccurrances = 0;
-               __pFindWordEditField->SetText(L"");
+
+               if (__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
+               {
+                       __pFindWordEditField->SetText(L"");
+                       __pFindWordEditField->HideKeypad();
+                       __pFindWordControl->SetShowState(false);
+                       __pFindWordCountLabel->SetText(L"0/0");
+               }
+               else if(__pFindWordPanelRightToLeft && __pFindWordPanelRightToLeft->GetShowState() == true)
+               {
+                       __pFindWordEditFieldRightToLeft->SetText(L"");
+                       __pFindWordEditFieldRightToLeft->HideKeypad();
+                       __pFindWordControl->SetShowState(false);
+                       __pFindWordCountLabelRightToLeft->SetText(L"0/0");
+               }
+
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
-               __pFindWordCountLabel->SetText(L"0/0");
+
                __pWebViewer->SearchText(L"aaaabbbbcccc",true);
                __pFindWordControl->SetShowState(false);
-               __pFindWordEditField->HideKeypad();
        }
        if(__pAddressbar->GetShowState() == false)
        {
@@ -4005,6 +4193,16 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
                }
        }
 
+       if (__pFindWordBgLabelRightToLeft != null)
+       {
+               Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_FINDWORD_INPUT_FIELD_BG, __pFindWordBgLabelRightToLeft->GetWidth(), __pFindWordBgLabelRightToLeft->GetHeight());
+               if (pBitmap != null)
+               {
+                       __pFindWordBgLabelRightToLeft->SetBackgroundBitmap(*pBitmap);
+                       delete pBitmap;
+               }
+       }
+
        if(__pMenu != null)
                __pMenu->SetShowState(false);
        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
@@ -4143,6 +4341,7 @@ MainForm::OnSettingsChange(int settingvalue)
                {
                        WebSetting settings = __pWebViewer->GetSetting();
                        settings.SetAutoFormDataShowEnabled(SettingPresentationModel::GetInstance()->IsRememberFormData());
+                       __pWebViewer->SetSetting(settings);
                }
        }
        else if(settingvalue == (int) REGISTRY_SETTING_REMEMBER_PASSWORD)
@@ -4150,7 +4349,8 @@ MainForm::OnSettingsChange(int settingvalue)
                if (__pWebViewer)
                {
                        WebSetting settings = __pWebViewer->GetSetting();
-                       settings.SetAutoFormDataShowEnabled(SettingPresentationModel::GetInstance()->IsRememberPassword());
+                       settings.SetAutoLoginFormFillEnabled(SettingPresentationModel::GetInstance()->IsRememberPassword());
+                       __pWebViewer->SetSetting(settings);
                }
        }
        else if (settingvalue == (int) REGISTRY_SETTING_SHOW_SECURITY_WARNINGS)
@@ -4380,9 +4580,17 @@ MainForm::OnTextValueChanged (const Tizen::Ui::Control &source)
                        __pFooterUrlField->SetKeypadActionEnabled(true);
                }
        }
-       if (__pFindWordEditField != null)
+       if (__pFindWordEditField != null && __pFindWordEditField->GetShowState() == true)
        {
                __currentSearchStr = __pFindWordEditField->GetText();
+               if (__currentSearchStr.GetLength() > 0)
+               {
+                       __pFindWordCountLabel->SetShowState(true);
+               }
+               else
+               {
+                       __pFindWordCountLabel->SetShowState(false);
+               }
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
                __pFindWordNext->Invalidate(true);
@@ -4390,6 +4598,25 @@ MainForm::OnTextValueChanged (const Tizen::Ui::Control &source)
                __pFindWordCountLabel->SetText(L"0/0");
                __pFindWordCountLabel->Invalidate(true);
        }
+       else if (__pFindWordEditFieldRightToLeft != null && __pFindWordEditFieldRightToLeft->GetShowState() == true)
+       {
+               __currentSearchStr = __pFindWordEditFieldRightToLeft->GetText();
+               if (__currentSearchStr.GetLength() > 0)
+               {
+                       __pFindWordCountLabelRightToLeft->SetShowState(true);
+               }
+               else
+               {
+                       __pFindWordCountLabelRightToLeft->SetShowState(false);
+               }
+
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordNext->Invalidate(true);
+               __pFindWordPrev->Invalidate(true);
+               __pFindWordCountLabelRightToLeft->SetText(L"0/0");
+               __pFindWordCountLabelRightToLeft->Invalidate(true);
+       }
        AppLog("__currentSearchStr %ls",__currentSearchStr.GetPointer());
        if (__currentSearchStr.GetLength() > 0)
        {
index 56c1660..047b2d8 100644 (file)
@@ -671,17 +671,17 @@ String
 SettingPresentationModel::GetSearchUrl(const String& searchText)
 {
        String searchStr = L"";
-       if (GetSearchEngine().CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_YAHOO")) == 0)
+       if (GetSearchEngine().CompareTo(L"Yahoo") == 0)
        {
                searchStr.Append(L"http://search.yahoo.com/search?p=");
                searchStr.Append(searchText);
        }
-       else if (GetSearchEngine().CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_NAVER")) == 0)
+       else if (GetSearchEngine().CompareTo(L"Naver") == 0)
        {
                searchStr.Append(L"http://search.naver.com/search.naver?query=");
                searchStr.Append(searchText);
        }
-       else if (GetSearchEngine().CompareTo(CommonUtil::GetString(L"IDS_COM_BODY_GOOGLE")) == 0)
+       else if (GetSearchEngine().CompareTo(L"Google") == 0)
        {
                searchStr.Append(L"http://www.google.com/search?q=");
                searchStr.Append(searchText);