Fixed Nabi Issues

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

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index 898fec1..2ca197c 100644 (file)
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -377,7 +377,7 @@ private:
        Tizen::Media::Image* __pSaveImage;
        Tizen::Web::Controls::Web* __pWebReader;
        Tizen::Web::Controls::Web* __pWebViewer;
-       WindowInfo*     __pWindowInfo;
+
        Tizen::Ui::Controls::ListView* __pMostVisitedListView;
 
        Tizen::Graphics::Point __touchPoint1;
@@ -399,6 +399,7 @@ private:
        Tizen::Graphics::Point __longPressPoint;
        NotificationPanel* __pNotification;
        int __fontSize;
+       WindowInfo*     __pWindowInfo;
 //     bool __isHwKeySupported;
 };
 

diff --git a/inc/IntMultipleWindowPresentationModel.h b/inc/IntMultipleWindowPresentationModel.h
index aa232be..692e8f1 100644 (file)
--- a/inc/IntMultipleWindowPresentationModel.h
+++ b/inc/IntMultipleWindowPresentationModel.h
@@ -232,6 +232,7 @@ private:
        static Tizen::Base::Collection::ArrayList* __pAllWindowList;
        static WindowInfo* __pCurWindowInfo;
        static MultipleWindowPresentationModel* __pMultiWindowManager;
+       Tizen::Ui::Controls::MessageBox* __pMessageBox;
 };
 
 #endif // _INT_MULTIPLE_WINDOW_PRESENTATION_MODEL_H_

diff --git a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
index 51ea8f0..79d80ea 100644 (file)
--- a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
+++ b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.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="" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" 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_BR_SK_CANCEL" type="right"/>
+            <buttonItem accessibilityHint="" actionId="102" 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="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="right"/>
         </itemSet>
     </Header>
     <Label id="IDC_LABEL1" parent="IDL_CREATE_BOOKMARK_FOLDER">

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 8cfea2c..f049ae8 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -206,7 +206,7 @@ BookmarkListForm::OnInitializing(void)
        if (__pPopUp != null)
        {
                __pPopUp->Initialize();
-               AddControl(__pPopUp);
+//             AddControl(__pPopUp);
        }
 
        __pSearchListView = new(std::nothrow) ListView();
@@ -866,7 +866,13 @@ BookmarkListForm::OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListVie
        case IDA_CONTEXT_ITEM_SHARE:
        {
                AppLogDebug("OnListViewContextItemStateChanged Share");
-
+               if (__pPopUp != null)
+               {
+                       delete __pPopUp;
+                       __pPopUp = null;
+               }
+               __pPopUp = new(std::nothrow) SharePopup();
+               __pPopUp->Initialize();
                BookmarkData* pBookmark = dynamic_cast<BookmarkData*>(__pData->GetAt(index));
                if (pBookmark != null)
                {

diff --git a/src/IntCreateBookmarkFolderForm.cpp b/src/IntCreateBookmarkFolderForm.cpp
index 838805b..d1b750b 100644 (file)
--- a/src/IntCreateBookmarkFolderForm.cpp
+++ b/src/IntCreateBookmarkFolderForm.cpp
@@ -443,11 +443,11 @@ CreateBookmarkFolderForm::OnTextValueChanged(const Control& source)
        // To disable done button when folder title edit-field is empty
        if (__pFolderTitle && title.GetLength() == 0)
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
        }
        else
        {
-               pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+               pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
        }
        pHeader->Invalidate(true);
        return;

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index 6efb794..e6b9cfd 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -900,7 +900,7 @@ EditHistoryListForm::GetMonth(int month)
                monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAR"));;
                break;
        case 4:
-               monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APR"));;
+               monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APRIL"));;
                break;
        case 5:
                monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAY"));;

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 933cda8..a1e65aa 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -1123,7 +1123,7 @@ HistoryListForm::GetMonth(int month)
                monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAR"));
                break;
        case APRIL:
-               monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APR"));
+               monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APRIL"));
                break;
        case MAY:
                monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAY"));

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index d9138b0..3700267 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -238,6 +238,12 @@ InternetApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
 void
 InternetApp::OnForeground(void)
 {
+       UiApp* pApp = null;
+       pApp = UiApp::GetInstance();
+       if (pApp != null && pSceneManagementFrame != null)
+       {
+               pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_FULL_SCREEN);
+       }
        AppLog("InternetApp::OnForeground");
 
        AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
@@ -259,6 +265,8 @@ InternetApp::OnForeground(void)
        {
                pCurrentForm->SendUserEvent(FORE_GROUND_APP_EVENT, NULL);
        }
+
+
 }
 
 void
@@ -315,6 +323,14 @@ InternetApp::OnSettingChanged(Tizen::Base::String& key)
 void
 InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operationId, const String* pUriScheme, const String *pDataType, const IMap *pArgs)
 {
+       UiApp* pApp = null;
+       pApp = UiApp::GetInstance();
+       if (pApp != null &&  pSceneManagementFrame != null)
+       {
+               pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_FULL_SCREEN);
+
+       }
+
        AppLogDebug("ABC::Internet::OnAppControlRequestReceivedN entered %ls",operationId.GetPointer());
        __operationId.Clear();
        __operationId.Append(operationId);

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 12e6f29..c76c120 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -883,6 +883,7 @@ result
 MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOption = false)
 {
        result r = E_SUCCESS;
+       bool clipboardAvailable = true;
        ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_AUTO;
 
        AppLog("MainForm::InitSelectTextContextMenu clicked on text");
@@ -901,6 +902,39 @@ MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOpt
        {
                direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
        }
+
+
+       Clipboard* pClipboard = Clipboard::GetInstance();
+
+       if(pClipboard == null)
+       {
+               clipboardAvailable = false;
+       }
+       else
+       {
+               // Retrieves a latest item
+               ClipboardItem* pItem = pClipboard->RetrieveLatestItemN(CLIPBOARD_DATA_TYPE_TEXT | CLIPBOARD_DATA_TYPE_HTML);
+
+               if(pItem == null)
+               {
+                       clipboardAvailable = false;
+               }
+               else
+               {
+                       //Gets data from the clipboard item
+                       String* pString = dynamic_cast<String*>(pItem->GetData());
+
+                       if(pString == null)
+                       {
+                               clipboardAvailable = false;
+                       }
+               }
+       }
+       if(clipboardAvailable == false && onlyPasteOption == true)
+       {
+               return E_FAILURE;
+       }
+
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_GRID, direction);
        TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
@@ -909,7 +943,7 @@ MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOpt
        {
                r = __pImageMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_COPY"),IDA_COPY_TEXT_CLICKED);
        }
-       if (pasteOption || onlyPasteOption)
+       if ((pasteOption || onlyPasteOption) && clipboardAvailable == true)
        {
                r = __pImageMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_PASTE"),IDA_PASTE_TEXT_CLICKED);
        }
@@ -932,6 +966,7 @@ result
 MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPasteOption = false)
 {
        result r = E_SUCCESS;
+       bool clipboardAvailable = true;
        ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_AUTO;
 
        AppLog("MainForm::InitSelectTextContextMenu clicked on text");
@@ -956,15 +991,50 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa
                direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
        }
 
+
+       Clipboard* pClipboard = Clipboard::GetInstance();
+
+       if(pClipboard == null)
+       {
+               clipboardAvailable = false;
+       }
+       else
+       {
+               // Retrieves a latest item
+               ClipboardItem* pItem = pClipboard->RetrieveLatestItemN(CLIPBOARD_DATA_TYPE_TEXT | CLIPBOARD_DATA_TYPE_HTML);
+
+               if(pItem == null)
+               {
+                       clipboardAvailable = false;
+               }
+               else
+               {
+                       //Gets data from the clipboard item
+                       String* pString = dynamic_cast<String*>(pItem->GetData());
+
+                       if(pString == null)
+                       {
+                               clipboardAvailable = false;
+                       }
+               }
+       }
+       if(clipboardAvailable == false && onlyPasteOption == true)
+       {
+               return E_FAILURE;
+       }
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_GRID, direction);
        TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
 
+
+
+
+
        if(onlyPasteOption == false)
        {
                r = __pImageMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_COPY"),IDA_COPY_TEXT_CLICKED);
        }
-       if (pasteOption || onlyPasteOption)
+       if ((pasteOption || onlyPasteOption) && clipboardAvailable == true)
        {
                r = __pImageMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_PASTE"),IDA_PASTE_TEXT_CLICKED);
        }
@@ -1874,7 +1944,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                __pOptionMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
                                __pOptionMenu->SetMaxVisibleItemsCount(6);
                        }
-                       if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
+                       if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
                        {
                                AppLog(" Orientation landscape");
                                __pOptionMenu->SetMaxVisibleItemsCount(5);
@@ -2004,7 +2074,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
                __pFindWordCountLabel->SetText(L"0/0");
-               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pWebViewer->SearchTextAllAsync(L"",true);
                AppLog("akjshdasd 1");
                if(__isKeypadOpened == false)
                        __pFooterPanel->SetShowState(true);
@@ -2621,7 +2691,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                                                return;
                                        }
                                        r = pAllWindowList->RemoveAt(count, true);
-                                       __pWindowInfo = null;
+//                                     __pWindowInfo = null;
                                        if (IsFailed(r))
                                        {
                                                AppLogException("MainForm::OnFormBackRequested failed with %s", GetErrorMessage(r));
@@ -2647,7 +2717,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                                        else
                                        {
                                                if(pWindowInfo != null)
-                                                       r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+                                                       r = pSceneManager->GoForward(ForwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_HISTORY_OPTION_ADD_HISTORY,SCENE_DESTROY_OPTION_DESTROY));
                                                if (IsFailed(r))
                                                {
                                                        AppLogException("MainForm::OnFormBackRequested failed with %s", GetErrorMessage(r));
@@ -3393,7 +3463,7 @@ MainForm::OnFocusGained(const Tizen::Ui::Control& source)
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
 
-               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pWebViewer->SearchTextAllAsync(L"",true);
                __pFindWordControl->SetShowState(false);
        }
        RelayoutControls(false);
@@ -3892,11 +3962,11 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                AppLog("MainForm::OnWebPageBlockSelected web not null");
                __pHitElementResult = __pWebViewer->GetElementByPointN(startPoint);
 
-               if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().CompareTo(L"INPUT") != 0 && __pHitElementResult->GetTagName().CompareTo(L"TEXTAREA") != 0))
+               if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().Equals(L"INPUT",false) == false && __pHitElementResult->GetTagName().Equals(L"TEXTAREA",false) == false))
                {
                        AppLog("datafirst startpoint error %s",GetErrorMessage(GetLastResult()));
                        __pHitElementResult = __pWebViewer->GetElementByPointN(endPoint);
-                       if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().CompareTo(L"INPUT") != 0 && __pHitElementResult->GetTagName().CompareTo(L"TEXTAREA") != 0))
+                       if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().Equals(L"INPUT",false) == false && __pHitElementResult->GetTagName().Equals(L"TEXTAREA",false) == false))
                        {
                                __pHitElementResult = __pWebViewer->GetElementByPointN(__longPressPoint);
                        }
@@ -3934,9 +4004,12 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
                        InitSelectTextContextMenuF(FloatPoint(endPoint.x,endPoint.y + __pWebViewer->GetY()),true);
-                       __pImageMenu->SetShowState(true);
-                       __pImageMenu->Show();
-                       __pImageMenu->Invalidate(true);
+                       if(__pImageMenu)
+                       {
+                               __pImageMenu->SetShowState(true);
+                               __pImageMenu->Show();
+                               __pImageMenu->Invalidate(true);
+                       }
                }
                else /*if(__isLongPressedDone == true)*/
                {
@@ -3948,9 +4021,12 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
                                __currentSelectedStr = __pHitElementResult->GetUrl();
                        }
                        InitSelectTextContextMenuF(FloatPoint(endPoint.x,endPoint.y + __pWebViewer->GetY()),false);
-                       __pImageMenu->SetShowState(true);
-                       __pImageMenu->Show();
-                       __pImageMenu->Invalidate(true);
+                       if(__pImageMenu)
+                       {
+                               __pImageMenu->SetShowState(true);
+                               __pImageMenu->Show();
+                               __pImageMenu->Invalidate(true);
+                       }
                }
 
                AppLog("MainForm::OnWebPageBlockSelected block text is %ls",__currentSelectedStr.GetPointer());
@@ -3969,6 +4045,7 @@ MainForm::OnWebPageShowRequested(Tizen::Web::Controls::Web& source)
 Web*
 MainForm::OnWebWindowCreateRequested(void)
 {
+       AppLog("MainForm::OnWebWindowCreateRequested entered");
        WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
        if (pNewWindowInfo == null)
@@ -4481,7 +4558,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
                __isLongPressedDone = true;
                result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0  && type.CompareTo(L"submit") !=0 && type.CompareTo(L"range") !=0/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
+               if (((tagName.Equals(L"INPUT",false) == true)  || tagName.Equals(L"TEXTAREA",false) == true) && innerHtml.GetLength() == 0  && type.Equals(L"submit",false) !=true && type.Equals(L"range",false) !=true/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.Equals(L"",false) == true && r == E_INVALID_ARG)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -4560,7 +4637,7 @@ MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEven
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
 
-               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pWebViewer->SearchTextAllAsync(L"",true);
                __pFindWordControl->SetShowState(false);
        }
        AppLog("__pAddressbar->GetShowState() %d",__pAddressbar->GetShowState());
@@ -4622,7 +4699,7 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
 
        if(__pOptionMenu && __pOptionMenu->GetShowState() == true)
        {
-               if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
+               if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
                {
                        AppLog(" Orientation landscape");
                        __pOptionMenu->SetMaxVisibleItemsCount(5);
@@ -5665,7 +5742,7 @@ MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                        __pOptionMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
                        __pOptionMenu->SetMaxVisibleItemsCount(6);
                }
-               if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
+               if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
                {
                        AppLog(" Orientation landscape");
                        __pOptionMenu->SetMaxVisibleItemsCount(5);

diff --git a/src/IntMultipleWindowPresentationModel.cpp b/src/IntMultipleWindowPresentationModel.cpp
index e7b66ca..21b0fc0 100644 (file)
--- a/src/IntMultipleWindowPresentationModel.cpp
+++ b/src/IntMultipleWindowPresentationModel.cpp
@@ -60,6 +60,7 @@ WindowInfo::WindowInfo(void)
        pCurrentWeb = null;
        pWebCanvasBitmap = null;
        pFormCanvasBitmap = null;
+
 }
 
 WindowInfo::~WindowInfo(void)
@@ -73,7 +74,7 @@ WindowInfo::~WindowInfo(void)
 
 MultipleWindowPresentationModel::MultipleWindowPresentationModel(void)
 {
-
+       __pMessageBox = null;
 }
 
 MultipleWindowPresentationModel::~MultipleWindowPresentationModel(void)
@@ -212,6 +213,8 @@ MultipleWindowPresentationModel::CreateNewMainViewSceneN(const String& Url, bool
                String strTitle = L"";//CommonUtil::GetString(L"IDS_COM_SK_MAX_LIMIT_REACHED");
                String strText = CommonUtil::GetString(L"IDS_BR_BODY_COULD_NOT_OPEN_NEW_WINDOW_BECAUSE_YOU_HAVE_ALREADY_OPENED_MAXIMUM_NUMBER");
                ShowPopup(strTitle, strText);
+//             ShowPopup(strTitle, strText);
+//             ShowPopup(strTitle, strText);
 
                return null;
        }
@@ -271,16 +274,21 @@ MultipleWindowPresentationModel::GetActiveWindowInfo()
 void
 MultipleWindowPresentationModel::ShowPopup(String& pTitle, String& pText)
 {
-       MessageBox messageBox;
-       messageBox.Construct(pTitle, pText,MSGBOX_STYLE_OK,3000);
+       if(__pMessageBox != null)
+       {
+               delete __pMessageBox;
+               __pMessageBox = null;
+       }
+       __pMessageBox = new(std::nothrow) MessageBox();
+       __pMessageBox->Construct(pTitle, pText,MSGBOX_STYLE_OK,3000);
        int modalResult = 0;
 
-       messageBox.ShowAndWait(modalResult);
+       __pMessageBox->ShowAndWait(modalResult);
        switch (modalResult)
        {
        case MSGBOX_RESULT_OK:
        {
-
+               AppLog("tealkkdfha");
        }
        break;
        default:

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index b5eaef2..2c6636f 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -229,6 +229,11 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via message
                        StartMessageAppControl();
+                       if(__pTimer == null)
+                       {
+                               __pTimer = new(std::nothrow) Timer();
+                               __pTimer->Construct(*this);
+                       }
                        __pTimer->Start(2500);
                }
        }
@@ -240,6 +245,11 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via email
                        StartEmailAppControl();
+                       if(__pTimer == null)
+                       {
+                               __pTimer = new(std::nothrow) Timer();
+                               __pTimer->Construct(*this);
+                       }
                        __pTimer->Start(2500);
                }