Fixed Nabi Issues 47369,47297

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

diff --git a/inc/IntMultipleWindowPresentationModel.h b/inc/IntMultipleWindowPresentationModel.h
index 903dbfb..aa232be 100644 (file)
--- a/inc/IntMultipleWindowPresentationModel.h
+++ b/inc/IntMultipleWindowPresentationModel.h
@@ -59,6 +59,7 @@ class WindowInfo
        int ID;
        bool isAppcontrolTriggered;
        bool isJavascriptInitiated;
+       bool isFirstLaunch;
        Tizen::Base::String pageTitle;
        Tizen::Base::String pageUrl;
        Tizen::Web::Controls::Web* pCurrentWeb;

diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
index 8bddcab..47e61d2 100644 (file)
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -14,8 +14,8 @@
     <Header>
         <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="Add Bookmarks" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>
-            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
+            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="right"/>
         </itemSet>
     </Header>
     <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">

diff --git a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
index f793e59..4309309 100644 (file)
--- a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
+++ b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
@@ -14,8 +14,8 @@
     <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" showMenuButton="false"/>
         <itemSet>
+            <footerItem accessibilityHint="" actionId="110" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="::IDS_COM_SK_CANCEL_A"/>
             <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>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index acb9a3f..a7b413c 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -483,6 +483,7 @@ AddBookmarkForm::OnListViewItemLongPressed(ListView& listView, int index, int el
 void
 AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int elementId, ListItemStatus status)
 {
+       AppLog("AddBookmarkForm::OnListViewItemStateChanged listitemstatus %d for index",status,index);
        if (__pEditFieldTitle != NULL)
        {
                __pEditFieldTitle->HideKeypad();
@@ -1058,12 +1059,12 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        // To disable done button if either of the Title or Url field is empty
        if (title.GetLength() == 0 || url.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
                pHeader->Invalidate(true);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
                pHeader->Invalidate(true);
        }
 
@@ -1144,12 +1145,12 @@ AddBookmarkForm::OnTextValueChanged(const Control& source)
        // To disable done button if either of the Title or Url field is empty
        if (title.GetLength() == 0 || url.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
                pHeader->Invalidate(true);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
                pHeader->Invalidate(true);
        }
 

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index 44486f5..6efb794 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -223,7 +223,7 @@ EditHistoryListForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
 
                if(__selectedCount > 0)
                {
-                       GetFooter()->SetItemEnabled(0, true);
+                       GetFooter()->SetItemEnabled(1, true);
                        GetFooter()->Invalidate(true);
                }
 
@@ -253,7 +253,7 @@ EditHistoryListForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
                __selectedCount = 0;
                __pSelectedLabel->Invalidate(true);
 
-               GetFooter()->SetItemEnabled(0, false);
+               GetFooter()->SetItemEnabled(1, false);
                GetFooter()->Invalidate(true);
 
                __pListView->Invalidate(true);
@@ -352,7 +352,7 @@ EditHistoryListForm::OnActionPerformed(const Tizen::Ui::Control& source, int act
 
                __pSelectAllCheck->SetSelected(false);
 
-               GetFooter()->SetItemEnabled(0,false);
+               GetFooter()->SetItemEnabled(1,false);
                GetFooter()->Invalidate(true);
                //selectedText.Append(L"\x200E"); // LEFT-TO-RIGHT MARK
                //      selectedText.Append(L"(0)");
@@ -792,7 +792,7 @@ EditHistoryListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
        selectedText.Format(25, CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED").GetPointer() , __selectedCount);
        __pSelectedLabel->SetText(selectedText);
        __pSelectedLabel->Invalidate(true);
-       GetFooter()->SetItemEnabled(0, false);
+       GetFooter()->SetItemEnabled(1, false);
        Invalidate(true);
 }
 
@@ -827,11 +827,11 @@ EditHistoryListForm::OnGroupedListViewItemStateChanged(Tizen::Ui::Controls::Grou
 
        if (__selectedCount == 0)
        {
-               GetFooter()->SetItemEnabled(0,false);
+               GetFooter()->SetItemEnabled(1,false);
        }
        else
        {
-               GetFooter()->SetItemEnabled(0,true);
+               GetFooter()->SetItemEnabled(1,true);
        }
        GetFooter()->Invalidate(true);
 

diff --git a/src/IntHistoryPresentationModel.cpp b/src/IntHistoryPresentationModel.cpp
index 3b8f694..aa8c67f 100644 (file)
--- a/src/IntHistoryPresentationModel.cpp
+++ b/src/IntHistoryPresentationModel.cpp
@@ -1199,7 +1199,7 @@ HistoryPresentationModel::GenerateFileName(void)
        String fileName = UiApp::GetInstance()->GetAppRootPath() + "/data/Thumbnail";
        result r = E_SUCCESS;
        int keyValue = 1;
-//     Directory::Create(fileName,true);
+       Directory::Create(fileName,true);
        fileName.Append(L"/thumbnails");
        r = pAppRegistry->Get(keyCount, keyValue);
 

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 8da5820..12e6f29 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2745,8 +2745,9 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                        LoadUrl(__pWindowInfo->pageUrl);
                        __pWindowInfo->isAppcontrolTriggered = false;
                }
-               else if (__pWindowInfo->isJavascriptInitiated == true)
+               else if (__pWindowInfo->isJavascriptInitiated == true && __pWindowInfo->isFirstLaunch == true)
                {
+                       __pWindowInfo->isFirstLaunch = false;
                        AppLog("Called");
                        InitWebControl();
                        __pWindowInfo->pCurrentWeb = __pWebViewer;

diff --git a/src/IntMultipleWindowPresentationModel.cpp b/src/IntMultipleWindowPresentationModel.cpp
index a6cc5c5..e7b66ca 100644 (file)
--- a/src/IntMultipleWindowPresentationModel.cpp
+++ b/src/IntMultipleWindowPresentationModel.cpp
@@ -51,6 +51,7 @@ WindowInfo::WindowInfo(void)
        formID.Append(ID);
        isAppcontrolTriggered = false;
        isJavascriptInitiated = false;
+       isFirstLaunch = true;
        faviconFilePath = "";
        faviconUrl = "";
        pageUrl = L"";