Fixed Nabi Issues submit/tizen_2.1/20130514.051202
authorVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 10 May 2013 16:28:19 +0000 (21:58 +0530)
committerVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 10 May 2013 16:28:19 +0000 (21:58 +0530)
Change-Id: I3a063da6d838e9125b426b22e863ba65e9c686b2
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
12 files changed:
inc/IntBrightnessForm.h
inc/IntMainForm.h
inc/IntSettingClearPrivateDataForm.h
inc/IntTypes.h
res/screen-size-normal/IDL_FIND_ON_PAGE.xml
res/screen-size-normal/IDL_FORM.xml
res/screen-size-normal/IDL_SETTING_FORM.xml
src/IntAddBookmarkForm.cpp
src/IntBookmarkListForm.cpp
src/IntHistoryListForm.cpp
src/IntInternetApp.cpp
src/IntMainForm.cpp

index 093888c..4ae31e0 100644 (file)
@@ -1,7 +1,7 @@
 
 // Copyright   2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the License);
+// Licensed under the Apache License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
index fae7bae..cf355f3 100644 (file)
@@ -270,6 +270,9 @@ public:
        void SetUrl(const Tizen::Base::String& url);
 
        void OnSharePopupControlStarted(void);
+
+       virtual void OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs);
+
 private:
        double findDistance(int x1,int y1,int x2, int y2);
        void FindNextWord(bool next = true);
index eaa1b73..0445e48 100644 (file)
@@ -1,7 +1,7 @@
 
 // Copyright   2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the License);
+// Licensed under the Apache License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
index fb12730..3b6c423 100644 (file)
@@ -35,6 +35,7 @@ static const int MAX_NOTEBOOK_TABLE_COLUMN = 8;
 static const int IDA_BUTTON_NO = 1000;
 static const int IDA_BUTTON_YES = 1001;
 
+const int BACK_GROUND_APP_EVENT = 999;
 static const unsigned int CUSTOM_COLOR_GREY = Tizen::Graphics::Color32<124,124,124>::Value;
 static const unsigned int CUSTOM_COLOR_TRANSPARENT = Tizen::Graphics::Color32<0,0,0>::Value;
 static const unsigned int CUSTOM_BACKGROUND_COLOR_LISTVIEW = Tizen::Graphics::Color32<236,240,242>::Value;
index b92bb60..37a20d3 100644 (file)
@@ -3,7 +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.201304081058" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201305071547" 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"/>
@@ -37,7 +37,7 @@
     <Label id="IDC_LABEL1" parent="IDC_PANEL1">
         <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_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_PARENT" 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_PANEL1" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL1" 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_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="923.0" x="0.0" y="0.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>
     <Button id="IDC_FIND_CLEAR" parent="IDC_PANEL1">
         <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"/>
index 6c2b0e5..4ee5914 100644 (file)
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201304261605" Dversion="20120315">
+<Scene Bversion="2.0.0.201305071547" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -57,7 +57,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
     </Button>
     <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" 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"/>
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="241.0" x="212.0" y="25.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="758.0" x="224.0" y="19.0"/>
     </EditField>
index a696eae..40da3c7 100644 (file)
@@ -3,10 +3,11 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="3.0.0.201212201745" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201305071547" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SETTING_FORM">
-        <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>
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Internet" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="Internet" titleTextColor=""/>
         <itemSet/>
     </Header>
     <GroupedListView id="IDC_SETTING_LIST" parent="IDL_SETTING_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#F9F9F9" backgroundColorOpacity="100" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="#8E9AA3" sectionColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1009" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="704" x="16" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="0" x="0" y="0"/>
+        <property backgroundBitmapPath="" backgroundColor="#F9F9F9" backgroundColorOpacity="100" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sectionColor="" sweepEnabled="false" textOfEmptyList=""/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SETTING_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0.0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="523.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_SETTING_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDL_SETTING_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>
     </GroupedListView>
 </Scene>
index d14911f..f058e16 100644 (file)
@@ -44,7 +44,7 @@ using namespace Tizen::Ui::Scenes;
 
 static const int LIST_ITEM_HEIGHT = 112;
 static const int H_ITEM_HEIGHT = 112;
-static const int H_TITLE_ITEM_HEIGHT = 128;
+static const int H_TITLE_ITEM_HEIGHT = 140;
 static const wchar_t* IDB_LIST_LEFT_SIDE = L"ListLeftSide.png";
 
 const int AddBookmarkForm::IDA_CREATE_BOOKMARK_FOLDER = 101;
@@ -1134,7 +1134,7 @@ AddBookmarkForm::OnOrientationChanged(const Control& source, OrientationStatus o
 
        if (__pList != null)
        {
-               __pList->SetBounds(__pList->GetX(),__pList->GetY(),__pList->GetWidth(),__listHeight);
+               __pList->SetBounds(__pList->GetX(),__pList->GetY(),GetClientAreaBounds().width,__listHeight);
                __pList->UpdateList();
        }
        Invalidate(true);
index 2e6e31f..3821049 100644 (file)
@@ -314,6 +314,7 @@ BookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
        {
        case IDA_FOOTER_ITEM1:
        {
+               __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
                GetHeader()->SetItemSelected(0);
                GetHeader()->Invalidate(true);
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -1051,7 +1052,7 @@ void
 BookmarkListForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        GetFooter()->SetShowState(false);
-       __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
+//     __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->UpdateList();
        Invalidate(true);
 }
@@ -1059,7 +1060,11 @@ BookmarkListForm::OnKeypadOpened(Tizen::Ui::Control& source)
 void
 BookmarkListForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-
+       AppLog("jahsjkdad %d",Clipboard::GetInstance()->IsPopupVisible());
+       if(Clipboard::GetInstance()->IsPopupVisible() == true)
+       {
+               return;
+       }
        GetFooter()->SetShowState(true);
        GetFooter()->Invalidate(true);
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
@@ -1075,11 +1080,6 @@ BookmarkListForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui:
 {
        AppLog("BookmarkListForm::OnKeypadActionPerformed %d",keypadAction);
 
-       if (__pSearchBar != null)
-       {
-               __pSearchBar->HideKeypad();
-       }
-
        if ( __pSearchBar != null && keypadAction == KEYPAD_ACTION_SEARCH)
        {
                if (__pSearchBar->GetText().GetLength() == 0)
@@ -1087,6 +1087,11 @@ BookmarkListForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui:
                        return;
                }
 
+               if (__pSearchBar != null)
+               {
+                       __pSearchBar->HideKeypad();
+               }
+
                __searchText = __pSearchBar->GetText();
                __searchBookmark = true;
                __pListview->SetShowState(false);
index 112417f..3113aff 100644 (file)
@@ -234,6 +234,7 @@ HistoryListForm::OnTerminating(void)
 {
        result r = E_SUCCESS;
 
+       SettingInfo::RemoveSettingEventListener(*this);
        return r;
 }
 
@@ -762,6 +763,13 @@ HistoryListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                pList->GetAt(pList->GetCount()-1,__previousSceneId);
        }
 
+       if(__pBookmarkList != null)
+       {
+               __pBookmarkList->RemoveAll(false);
+       }
+
+       BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
+
        AppLog("HistoryListForm::OnSceneActivatedN called");
        //GetHeader()->Invalidate(true);
        if (__pGroupData == null)
@@ -808,12 +816,7 @@ HistoryListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                return;
        }
 
-       if(__pBookmarkList != null)
-       {
-               __pBookmarkList->RemoveAll(false);
-       }
 
-       BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
 
        Invalidate(true);
 
@@ -1008,6 +1011,8 @@ HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
        }
        else
        {
+               // added
+               GetFooter()->SetShowState(false);
                //              __pSearchListView->SetEnabled(false);
                r = __pSearchListView->SetShowState(true);
                if (IsFailed(r))
index 7b319d5..0798b46 100644 (file)
@@ -187,6 +187,8 @@ InternetApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
 {
        AppLogDebug("Internet::OnAppTerminating");
 
+       SettingInfo::RemoveSettingEventListener(*this);
+
        return true;
 }
 
@@ -200,7 +202,11 @@ InternetApp::OnForeground(void)
 void
 InternetApp::OnBackground(void)
 {
-
+       Form* pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
+       if(pCurrentForm)
+       {
+               pCurrentForm->SendUserEvent(BACK_GROUND_APP_EVENT, NULL);
+       }
 }
 
 void
index ee08d08..f16dbc7 100644 (file)
@@ -93,6 +93,7 @@ const int IDA_ADD_TO_HOME_CLICKED = 118;
 const int IDA_SAVED_PAGES_CLICKED = 119;
 const int IDA_DESKTOP_VIEW_CLICKED = 120;
 const int IDA_SAVE_CLICKED = 121;
+const int IDA_PRINT_CLICKED = 122;
 
 const int IDA_FINDWORD_SEARCH_CLICKED = 201;
 const int IDA_FINDWORD_NEXT_CLICKED = 202;
@@ -675,7 +676,17 @@ MainForm::InitFooter(void)
        }
        __pGoForwardBtn->SetActionId(IDA_GO_FORWARD);
        __pGoForwardBtn->AddActionEventListener(*this);
-       __pGoForwardBtn->SetEnabled(false);
+//     __pGoForwardBtn->SetEnabled(false);
+       if (__pWebViewer && __pWebViewer->CanGoForward())
+       {
+               //__pAddressbar->SetForwardButtonEnabled(true);
+               SetForwardButtonEnabled(true);
+       }
+       else
+       {
+               //__pAddressbar->SetForwardButtonEnabled(false);
+               SetForwardButtonEnabled(false);
+       }
 
        __pRefreshBtn = static_cast<Button*> (GetControl(L"IDC_REFRESH_BUTTON",true));
        if (__pRefreshBtn == NULL)
@@ -1541,6 +1552,71 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        }
        break;
+       case IDA_PRINT_CLICKED:
+       {
+               r = __pWebViewer->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf");
+               AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
+
+               AppLog("RequestPrint called!");
+               Tizen::App::AppControl* pAc = Tizen::App::AppManager::FindAppControlN(L"org.tizen.mobileprint", L"http://tizen.org/appcontrol/operation/print");
+               result nResult = E_FAILURE;
+               if (pAc)
+               {
+                       AppLog("TestPrint if (pAc) == true");
+
+                       HashMap map;
+                       map.Construct();
+
+                       String fileType = L"service_print_files_type";
+                       String typeVal = L"DOC";
+
+                       String fileCount = L"service_print_files_count";
+                       String countVal = L"1";
+                       String fileFolder= L"service_print_files_folder_name";
+                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//data";
+
+                       map.Add(&fileCount, &countVal);
+//                     map.Add(&fileIndex, &indexVal);
+                       map.Add(&fileFolder, &folderVal);
+                       map.Add(&fileType, &typeVal);
+
+                       String fileName = L"service_print_files_files_name";
+
+                       ArrayList fileNameList;
+                       fileNameList.Construct();
+                       String file1 = L"test.pdf";
+
+                       fileNameList.Add(&file1);
+                       map.Add(&fileName, &fileNameList);
+
+                       nResult = pAc->Start(NULL, NULL, &map, NULL);
+
+                       if (nResult == E_SUCCESS) AppLog("TestPrint ret == E_SUCCESS");
+                       else if (nResult == E_MAX_EXCEEDED)
+                               AppLog("TestPrint ret == E_MAX_EXCEEDED");
+                       else if (nResult == E_OBJ_NOT_FOUND)
+                               AppLog("TestPrint ret == E_OBJ_NOT_FOUND");
+                       else if (nResult == E_IN_PROGRESS)
+                               AppLog("TestPrint ret == E_IN_PROGRESS");
+                       else if (nResult == E_PRIVILEGE_DENIED)
+                               AppLog("TestPrint ret == E_PRIVILEGE_DENIED");
+                       else if(nResult == E_SYSTEM)
+                               AppLog("TestPrint ret == E_SYSTEM");
+
+                       delete pAc;
+               }
+               else
+               {
+                       int __modalMsgBoxResult;
+                       MessageBox* pMsgBox = new MessageBox();
+                       pMsgBox->Construct("Not Supported","Not Supported",MSGBOX_STYLE_OK,3000);
+                       pMsgBox->ShowAndWait(__modalMsgBoxResult);
+                       delete pMsgBox;
+                       pMsgBox = null;
+                       __modalMsgBoxResult = 0;
+               }
+       }
+       break;
        case IDA_SHARE_CLICKED:
        {
                if(__pPopUp != null)
@@ -1606,7 +1682,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 3");
 
-                       if (__pMenu->GetItemCount() == 8)
+                       if (__pMenu->GetItemCount() == 9)
                        {
                                r = __pMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
                        }
@@ -1622,13 +1698,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return ;
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 4");
-                       if (__pMenu->GetItemCount() != 8)
+                       if (__pMenu->GetItemCount() != 9)
                        {
                                __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED);
-
+                               __pMenu->InsertItemAt(2,"Print", IDA_PRINT_CLICKED);
 //                             __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED);
-                               __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);
-                               __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
+                               __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);
+                               __pMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
                                __pMenu->SetMaxVisibleItemsCount(6);
                        }
                        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
@@ -1862,7 +1938,15 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        if (pNotification != null)
                        {
                                pNotification->SetText(msg);
-                               pNotification->SetPositionDiff(__pFooterPanel->GetHeight());
+                               if (__pFooterPanel->GetShowState() == true)
+                               {
+                                       pNotification->SetPositionDiff(__pFooterPanel->GetHeight());
+                               }
+                               else
+                               {
+                                       pNotification->SetPositionDiff(0);
+                               }
+
                                pNotification->ShowNotification();
                        }
                }
@@ -2007,6 +2091,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        case IDA_FIND_TEXT__CLICKED:
        {
                OnAddressCancelledClicked(*__pAddressbar);
+               __pFooterPanel->SetShowState(false);
                AppLogDebug("MainForm::OnActionPerformed find word clicked");
                __currentSearchStr.Clear();
                __currentSearchStr.Append(__currentSelectedStr);
@@ -2118,12 +2203,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        String idElement = __pHitElementResult->GetAttributeValue(L"id");
                        String nameElement = __pHitElementResult->GetAttributeValue(L"name");
                        AppLog("MainForm::IDA_PASTE_TEXT_CLICKED id is %ls",idElement.GetPointer());
-                       String script = L"function insertAtCursor(myField, myValue) {   if (document.selection) {               myField.focus();                sel = document.selection.createRange();                 sel.text = myValue;     }               else if (myField.selectionStart || myField.selectionStart == '0'){              var startPos = myField.selectionStart;          var endPos = myField.selectionEnd;              myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);          } else {                        myField.value += myValue;               }       } ";
+//                     String script = L"function insertAtCursor(myField, myValue) {   if (document.selection) {               myField.focus();                sel = document.selection.createRange();                 sel.text = myValue;     }               else if (myField.selectionStart || myField.selectionStart == '0'){              var startPos = myField.selectionStart;          var endPos = myField.selectionEnd;              myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);          } else {                        myField.value += myValue;               }       } ";
+                       String script = L"function insertAtCursor(myField, myValue) {  if (document.selection) {   document.getElementById(myField).focus();   sel = document.selection.createRange();   sel.text = myValue;  }   else if (document.getElementById(myField).selectionStart || document.getElementById(myField).selectionStart == '0'){   var startPos = document.getElementById(myField).selectionStart;   var endPos = document.getElementById(myField).selectionEnd;   document.getElementById(myField).value = document.getElementById(myField).value.substring(0, startPos)+ myValue + document.getElementById(myField).value.substring(endPos, document.getElementById(myField).value.length);   } else {    document.getElementById(myField).value += myValue;   }  } ";
                        if(idElement.GetLength() != 0)
                        {
-                               script.Append("insertAtCursor(");
+                               script.Append("insertAtCursor('");
                                script.Append(idElement);
-                               script.Append(",");
+                               script.Append("',");
                                script.Append("\"");
                                script.Append(*pString);
                                script.Append("\");");
@@ -3661,11 +3747,11 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
                __pFooterPanel->SetShowState(false);
                __pWebViewer->SetBounds(Rectangle(0, 0,GetClientAreaBounds().width, GetClientAreaBounds().height));
        }
-       if(__pImageMenu && __pImageMenu->GetShowState() == true)
-       {
-               __pImageMenu->SetAnchorPosition(Point(__pImageMenu->GetAnchorPosition().x/2,__pImageMenu->GetAnchorPosition().y/2));
-               AppLog("omgomgomg");
-       }
+//     if(__pImageMenu && __pImageMenu->GetShowState() == true)
+//     {
+//             __pImageMenu->SetAnchorPosition(Point(__pImageMenu->GetAnchorPosition().x/2,__pImageMenu->GetAnchorPosition().y/2));
+//             AppLog("omgomgomg");
+//     }
        Invalidate(true);
 }
 
@@ -3915,11 +4001,12 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
        AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height);
        int widthContextItem = 0;
 
-       if(__pWebViewer != null)
+       // As per the platform engineer comment removed this line
+       /*if(__pWebViewer != null)
        {
                // this is added because if any text is selected on long press followed by on rotation we are hiding the context menu therefore we should release the text block also
                __pWebViewer->ReleaseBlock();
-       }
+       }*/
 
        if(__pFindWordControl != null)
                ShowFindWordPanel(__pFindWordControl->GetShowState(), false);
@@ -4277,7 +4364,7 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
 void
 MainForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
-       __currentWordIndex = 0;
+//     __currentWordIndex = 0;
        __isLongPressedDone = false;
 
 }
@@ -4634,16 +4721,19 @@ void MainForm::SetUrl(const String& url)
                if (removedHttpUrl.IsEmpty() == false)
                {
                        __pFooterUrlField->SetText(removedHttpUrl);
+                       if(__pAddressbar != NULL)
                        __pAddressbar->SetUrl(__displayUrl);
                }
                else
                {
                        __pFooterUrlField->SetText(__displayUrl);
+                       if(__pAddressbar != NULL)
                        __pAddressbar->SetUrl(__displayUrl);
                }
                if(__pFooterUrlField)
                        __pFooterUrlField->SetCursorPosition(__pFooterUrlField->GetTextLength());
                __pFooterUrlField->Invalidate(false);
+               if(__pAddressbar != NULL)
                __pAddressbar->Invalidate(true);
 //             __pFooterUrlField->SetCursorPosition(0);
        }
@@ -4667,3 +4757,14 @@ void MainForm::OnSharePopupControlStarted(void)
 {
        __pWebViewer->AddTouchEventListener(*this);
 }
+
+void MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)
+{
+       if (requestId == BACK_GROUND_APP_EVENT)
+       {
+               if(__pWebViewer != null)
+               {
+                       __pWebViewer->Pause();
+               }
+       }
+}