Fixed Nabi Issues

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

diff --git a/inc/IntInternetApp.h b/inc/IntInternetApp.h
index 8301419..fba4d0e 100644 (file)
--- a/inc/IntInternetApp.h
+++ b/inc/IntInternetApp.h
@@ -28,6 +28,7 @@
 #include <FSystem.h>
 #include <FUi.h>
 
+#include "IntMainFrame.h"
 #include "IntMultipleWindowPresentationModel.h"
 
 class InternetApp
@@ -84,6 +85,7 @@ public:
 private:
        MultipleWindowPresentationModel* __pMultiWindowManager;
        WindowInfo* __pNewWindowInfo;//the new window object to be created either by the normal launch of application or as an appcontrol launch
+       MainFrame* pSceneManagementFrame;
 };
 
 #endif // _INT_INTERNET_APP_H_

diff --git a/res/screen-size-normal/IDL_ADDRESSBAR.xml b/res/screen-size-normal/IDL_ADDRESSBAR.xml
index daa8d3e..c684fe9 100644 (file)
--- a/res/screen-size-normal/IDL_ADDRESSBAR.xml
+++ b/res/screen-size-normal/IDL_ADDRESSBAR.xml
@@ -36,7 +36,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.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="96.0" x="0.0" y="0.0"/>
     </Label>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="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="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_field_btn_Clear_Press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="I01_field_btn_Clear_temp.png" 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="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_field_btn_Clear_Press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" 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_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="568.0" y="0.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="1122.0" y="0.0"/>
     </Button>

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index d5234ed..1c39882 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -187,6 +187,7 @@ Addressbar::Initialize(const Rectangle& rect)
        __pAddressBackBtn->SetActionId(IDA_CANCEL);
        __pAddressBackBtn->AddActionEventListener(*this);
        __pAddressBackBtn->SetShowState(true);
+       __pAddressBackBtn->SetFocusable(true);
        //IDC_ADDRESS_BACK_BUTTON
 
        // Added to get the favorite url if not set then address bar is about blank
@@ -655,6 +656,7 @@ Addressbar::OnFocusGained(const Control& source)
        {
                __pListener->OnAddressBarFocusGained(*this);
        }
+       __isAppBackGround = false;
 }
 
 void

diff --git a/src/IntConfirmationPopup.cpp b/src/IntConfirmationPopup.cpp
index 3b78c24..a5a3e04 100644 (file)
--- a/src/IntConfirmationPopup.cpp
+++ b/src/IntConfirmationPopup.cpp
@@ -113,7 +113,7 @@ bool
 ConfirmationPopup::OnKeyReleased (Control &source, const KeyEventInfo &keyEventInfo)
 {
        AppLog("ConfirmationPopup::OnKeyReleased %d",keyEventInfo.GetKeyCode());
-       if(keyEventInfo.GetKeyCode() == KEY_BACK)
+       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
        {
                if(GetShowState() == true)
                {

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 309c11f..933cda8 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -871,10 +871,10 @@ HistoryListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        //              __pGroupedListView->UpdateList();
        //      }
 
-       result r = GetHeader()->SetItemSelected(2);
+       result r = GetHeader()->SetItemSelected(1);
        if (IsFailed(r))
        {
-               AppLog("HistoryListForm::OnSceneActivatedN header failed %ls", GetErrorMessage(r));
+               AppLog("HistoryListForm::OnSceneActivatedN header failed %s", GetErrorMessage(r));
                return;
        }
 

diff --git a/src/IntHistoryPresentationModel.cpp b/src/IntHistoryPresentationModel.cpp
index e42ebac..cabc82f 100644 (file)
--- a/src/IntHistoryPresentationModel.cpp
+++ b/src/IntHistoryPresentationModel.cpp
@@ -1039,7 +1039,7 @@ HistoryPresentationModel::GetSearchHistoryCount(int& historyCount, String& text)
        query.Append(historyTable);
        query.Append(L".TITLE LIKE '%");
        query.Append(text);
-       query.Append("% 'ESCAPE '/')");
+       query.Append("%'ESCAPE '/')");
        query.Append(" OR ");
        query.Append(L"(");
        query.Append(historyTable);

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index d469b6e..be34a5b 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -47,7 +47,7 @@ static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/
 const int MIN_MEMORY_NEEDED = 1048576;
 
 InternetApp::InternetApp(void)
-: __pMultiWindowManager(NULL),__pNewWindowInfo(null)
+: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null)
 {
 }
 
@@ -138,10 +138,11 @@ InternetApp::OnAppInitialized(void)
 
 
        // Create a Frame
-       MainFrame* pSceneManagementFrame = new(std::nothrow) MainFrame();
+       pSceneManagementFrame = new(std::nothrow) MainFrame();
        pSceneManagementFrame->Construct();
        pSceneManagementFrame->SetName(L"SceneManagement");
        AddFrame(*pSceneManagementFrame);
+       pSceneManagementFrame->Show();
        // Goto the first scene.
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -323,6 +324,8 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                        urlData = *pUrl;
                }
                AppLog("URL received %ls", urlData.GetPointer());
+               if(pSceneManagementFrame)
+                       pSceneManagementFrame->Show();
 
                if (__pNewWindowInfo == null)
                {

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 7936809..47908fd 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -144,6 +144,7 @@ static const int WIDTH_CONTEXT_MENU_BUTTON_PORTRAIT = 336;
 static const int WIDTH_CONTEXT_MENU_BUTTON_LANDSCAPE = 800;
 static const int HEIGHT_CONTEXT_MENU_BUTTON = 72;
 
+static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/appcontrol/operation/view";
 MainForm::MainForm(void)
 {
        __isLongPressedDone = false;
@@ -824,6 +825,7 @@ result MainForm::InitImageContextMenu(Tizen::Graphics::Point p)
        __pImageMenu->SetMaxVisibleItemsCount(4);
        __pImageMenu->AddActionEventListener(*this);
        SetControlAlwaysOnTop(*__pImageMenu, true);
+       __pImageMenu->SetFocusable(true);
 
        CATCH: return r;
 }
@@ -860,6 +862,7 @@ MainForm::InitImageLinkContextMenu(Tizen::Graphics::Point p)
        __pImageMenu->SetMaxVisibleItemsCount(3);
        __pImageMenu->AddActionEventListener(*this);
        SetControlAlwaysOnTop(*__pImageMenu, true);
+       __pImageMenu->SetFocusable(true);
 
        CATCH: return r;
 
@@ -908,6 +911,7 @@ MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOpt
        __pImageMenu->SetMaxVisibleItemsCount(3);
        __pImageMenu->AddActionEventListener(*this);
        SetControlAlwaysOnTop(*__pImageMenu, true);
+       __pImageMenu->SetFocusable(true);
 
        CATCH: return r;
 
@@ -956,6 +960,7 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa
        __pImageMenu->SetMaxVisibleItemsCount(3);
        __pImageMenu->AddActionEventListener(*this);
        SetControlAlwaysOnTop(*__pImageMenu, true);
+       __pImageMenu->SetFocusable(true);
 
        CATCH: return r;
 
@@ -988,6 +993,11 @@ MainForm::InitFindWordPanel(void)
                                delete pBitmap;
                        }
                }
+               if(__pAddressbar)
+                       __pAddressbar->SetShowState(false);
+
+               if(__isKeypadOpened == false)
+                       __pFooterPanel->SetShowState(true);
                return r;
        }
 
@@ -2949,6 +2959,8 @@ MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
        WindowInfo::pFormCanvasBitmap->Construct(*pCanvas,Rectangle(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight()));
        delete pCanvas;
        delete pWebCanvas;
+       if(__pAddressbar)
+               __pAddressbar->SetShowState(false);
        AppLog("Coming here");
 }
 
@@ -3440,6 +3452,33 @@ MainForm::OnFocusGained(const Tizen::Ui::Control& source)
                __pAddressbar->SetShowState(true);
                __pAddressbar->SetAddressbarURLFocus();
        }
+       if(__pFindWordControl && __pFindWordControl->GetShowState() == true)
+       {
+               __currentSearchStr = L"";
+               __currentWordIndex = 0;
+               __maxOccurrances = 0;
+
+               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);
+
+               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pFindWordControl->SetShowState(false);
+       }
        RelayoutControls(false);
 }
 
@@ -5370,8 +5409,7 @@ MainForm::ShowIndicatorNotification(const String& messageText, const String& con
 
        Tizen::Shell::NotificationManager notiMgr;
        notiMgr.Construct();
-       notiMgr.NotifyOngoingActivity(request);
-
+       notiMgr.Notify(request);
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }
@@ -5793,6 +5831,10 @@ MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                delete pBitmap;
        }
        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED end");
+       if(__pAddressbar)
+               __pAddressbar->SetShowState(false);
+       SetFocus();
+       __pFooterPanel->SetShowState(true);
        result r = __pOptionMenu->SetShowState(true);
        AppLog("ajsghd %s",GetErrorMessage(r));
        __pOptionMenu->Invalidate(true);

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index 5a932e7..88e7f50 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -275,7 +275,7 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        __pConfirmationPopup->RemoveActionListener(*this);
                        __pConfirmationPopup->AddActionListener(*this);
                        __pConfirmationPopup->setMessage(closeWarning);
-//                     __pConfirmationPopup->Show();
+                       __pConfirmationPopup->Show();
                }
        }
        break;

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index 68dcf0b..ce40286 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -534,7 +534,7 @@ bool
 SharePopup::OnKeyReleased (Control &source, const KeyEventInfo &keyEventInfo)
 {
        AppLog("ConfirmationPopup::OnKeyReleased %d",keyEventInfo.GetKeyCode());
-       if(keyEventInfo.GetKeyCode() == KEY_BACK)
+       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
        {
                if(GetShowState() == true)
                {