Fixed Nabi issues

Change-Id: I100bb06a79a77ab40247142d4d20c01a2d9155ca
Signed-off-by: Seema <seema.nagraj@samsung.com>

diff --git a/inc/MmCommonUtils.h b/inc/MmCommonUtils.h
index f7c3f58..0223ba2 100644 (file)
--- a/inc/MmCommonUtils.h
+++ b/inc/MmCommonUtils.h
@@ -40,5 +40,5 @@ void LaunchAppToShare(int index, Tizen::Base::Collection::ArrayList* pAttachment
 int ShowMessagePopUp(const Tizen::Base::String& title, const Tizen::Base::String& text, const Tizen::Ui::Controls::MessageBoxStyle style, const unsigned long timeout);
 void ConstructDeletePopup(Tizen::Ui::Controls::Popup* pPopup, Tizen::Ui::IActionEventListener* pActionEventListener);
 Tizen::Base::String GetSettingsFontType(void);
-void RefreshEditListScene(void);
+void RefreshCurrentScene(void);
 #endif /* _MM_COMMON_UTILS_H_ */

diff --git a/src/MmCommonUtils.cpp b/src/MmCommonUtils.cpp
index 3a77d16..c76c5a8 100644 (file)
--- a/src/MmCommonUtils.cpp
+++ b/src/MmCommonUtils.cpp
@@ -25,6 +25,7 @@
 #include <FLocales.h>
 #include "MmCommonUtils.h"
 #include "MmTypes.h"
+#include "MmMemoApp.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -401,32 +402,9 @@ void AddFooterMenuItem(Footer* pFooter, ButtonItem& menuItem)
        delete pBitmapDim;
 }
 
-void RefreshEditListScene(void)
+void RefreshCurrentScene(void)
 {
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       if(pSceneManager != null)
-       {
-               Footer* pFooter = pSceneManager->GetCurrentScene()->GetForm()->GetFooter();
-               if(pFooter != null)
-               {
-                       pFooter->SetItemEnabled(0, true);
-                       pFooter->SetItemEnabled(1, true);
-                       pFooter->SetItemEnabled(2, true);
-                       pFooter->Draw();
-               }
-               Header* pHeader = pSceneManager->GetCurrentScene()->GetForm()->GetHeader();
-               if(pHeader != null)
-               {
-                       pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
-                       pHeader->Draw();
-               }
-
-       }
-       /*SceneManager* pSceneManager = SceneManager::GetInstance();
-       IList* pArgs = new (std::nothrow) ArrayList();
-       pArgs->Add(new (std::nothrow) Integer(ID_REFRESH_LIST_FROM_DATABASEVIEW));
-
-       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MEMO_LIST), pArgs);*/
+       MemoApp::CreateInstance()->GetAppFrame()->GetFrame()->SetEnabled(true);
 }
 
 String GetSettingsFontType(void)

diff --git a/src/MmDrawingDetailForm.cpp b/src/MmDrawingDetailForm.cpp
index fffe89a..e5af6cb 100644 (file)
--- a/src/MmDrawingDetailForm.cpp
+++ b/src/MmDrawingDetailForm.cpp
@@ -527,7 +527,7 @@ MemoDrawingDetailForm::OnListViewItemStateChanged(ListView& listView, int index,
                }
                __pDrawingFileName->Append(File::GetFileName(__pMemoData->GetMemoDrawingPath()));
                __pShareMemoList->Add(__pDrawingFileName);
-
+               static_cast<MemoApp*>(MemoApp::CreateInstance())->SetAppControlLaunchedStatus(true);
                LaunchAppToShare(index, __pShareMemoList);
        }
        return;

diff --git a/src/MmDrawingEditorForm.cpp b/src/MmDrawingEditorForm.cpp
index 6cd8303..58374a9 100644 (file)
--- a/src/MmDrawingEditorForm.cpp
+++ b/src/MmDrawingEditorForm.cpp
@@ -1198,6 +1198,7 @@ MemoDrawingEditorForm::OnActionPerformed(const Control& source, int actionId)
                                        else
                                        {
                                                UpdateMemoInfo();
+                                               (MemoThumbnailProvider::GetInstance())->RemoveObjectBitmap(__pEditMemo->GetMemoIndex());
                                        }
                                        isUpdate = true;
                                }

diff --git a/src/MmListEditorForm.cpp b/src/MmListEditorForm.cpp
index 0070bf3..7070065 100644 (file)
--- a/src/MmListEditorForm.cpp
+++ b/src/MmListEditorForm.cpp
@@ -313,10 +313,6 @@ MemoListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        }
                        __pDeletePopup->SetShowState(true);
                        __pDeletePopup->Show();
-                       __pFormHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
-                       __pFormHeader->Show();
-                       __pFormFooter->SetItemEnabled(2, false);
-                       SetFooterEnabled(false);
                }
                break;
 
@@ -332,10 +328,6 @@ MemoListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        }
                        __pPopup->SetShowState(true);
                        __pPopup->Show();
-                       __pFormHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
-                       __pFormHeader->Show();
-                       __pFormFooter->SetItemEnabled(2, false);
-                       SetFooterEnabled(false);
                }
                break;
 
@@ -351,10 +343,6 @@ MemoListEditorForm::OnActionPerformed(const Control& source, int actionId)
                {
                        __pPopup->SetShowState(false);
                        __pPopup->Invalidate(true);
-                       __pFormHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
-                       __pFormHeader->Show();
-                       __pFormFooter->SetItemEnabled(2, true);
-                       SetFooterEnabled(true);
                }
                break;
 

diff --git a/src/MmMemoApp.cpp b/src/MmMemoApp.cpp
index fd0d28d..14a2a9a 100644 (file)
--- a/src/MmMemoApp.cpp
+++ b/src/MmMemoApp.cpp
@@ -187,6 +187,7 @@ void
 MemoApp::SetAppControlLaunchedStatus(const bool launched)
 {
        __isAppControlLaunched = launched;
+       MemoApp::CreateInstance()->GetAppFrame()->GetFrame()->SetEnabled(false);
 }
 
 void
@@ -195,7 +196,7 @@ MemoApp::OnForeground(void)
        if(__isAppControlLaunched == true)
        {
                __isAppControlLaunched = false;
-               RefreshEditListScene();
+               RefreshCurrentScene();
        }
 }
 

diff --git a/src/MmTextDetailForm.cpp b/src/MmTextDetailForm.cpp
index 81e8478..9076070 100644 (file)
--- a/src/MmTextDetailForm.cpp
+++ b/src/MmTextDetailForm.cpp
@@ -24,6 +24,7 @@
 #include "MmInfo.h"
 #include "MmItemProviders.h"
 #include "MmListPresentationModel.h"
+#include "MmMemoApp.h"
 #include "MmTextDetailForm.h"
 #include "MmTypes.h"
 #include "MmVMemoCreator.h"
@@ -420,7 +421,7 @@ MemoTextDetailForm::OnListViewItemStateChanged(ListView& listView, int index, in
 
                *__pVntFilename = __pVMemoCreator->CreateVMemo(*__pMemoData);
                __pShareMemoList->Add(__pVntFilename);
-
+               static_cast<MemoApp*>(MemoApp::CreateInstance())->SetAppControlLaunchedStatus(true);
                LaunchAppToShare(index, __pShareMemoList);
        }
        return;

diff --git a/src/MmThumbnailProvider.cpp b/src/MmThumbnailProvider.cpp
index 36fbe7a..0511677 100644 (file)
--- a/src/MmThumbnailProvider.cpp
+++ b/src/MmThumbnailProvider.cpp
@@ -123,7 +123,7 @@ MemoThumbnailProvider::Construct(void)
 void
 MemoThumbnailProvider::RemoveObjectBitmap(int index)
 {
-       if (__pThumbnailList->GetCount() == 0)
+       if (__pThumbnailList == null ||__pThumbnailList->GetCount() == 0)
        {
                return ;
        }
@@ -167,11 +167,6 @@ MemoThumbnailProvider::RequestThumbnail(ThumbnailRequest* pRequest)
                return THUMBNAIL_MANAGER_RESULT_VALUES_FAILED;
        }
 
-       /*if (pRequest != null)
-       {
-               pRequest->SetBitmap(pBitmap);
-       }*/
-
        if (__pThumbnailList == null)
        {
                __pThumbnailList = new (std::nothrow) HashMap();