Nabi issues fixed

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

diff --git a/inc/MmDrawingDetailForm.h b/inc/MmDrawingDetailForm.h
index 0e2245a..3d94c95 100644 (file)
--- a/inc/MmDrawingDetailForm.h
+++ b/inc/MmDrawingDetailForm.h
@@ -23,6 +23,7 @@
 #define _MM_DRAWING_DETAIL_FORM_H_
 
 #include <FUi.h>
+#include <FUiITouchFlickGestureEventListener.h>
 
 class AppControlListProvider;
 class MemoInfo;

diff --git a/inc/MmTextDetailForm.h b/inc/MmTextDetailForm.h
index 78977bf..e699148 100644 (file)
--- a/inc/MmTextDetailForm.h
+++ b/inc/MmTextDetailForm.h
@@ -21,7 +21,7 @@
 
 #ifndef _MM_TEXT_DETAIL_FORM_H_
 #define _MM_TEXT_DETAIL_FORM_H_
-
+#include "FUiITouchFlickGestureEventListener.h"
 class AppControlListProvider;
 class MemoListPresentationModel;
 class VMemoCreator;
@@ -29,11 +29,11 @@ class VMemoCreator;
 class MemoTextDetailForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
-       , public Tizen::Ui::ITouchFlickGestureEventListener
        , public Tizen::Ui::IUiLinkEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::Controls::IListViewItemEventListener  //for AppControl list
        , public Tizen::Ui::Scenes::ISceneEventListener
+       , public Tizen::Ui::ITouchFlickGestureEventListener
 {
 public:
        MemoTextDetailForm(void);

diff --git a/src/MmCommonUtils.cpp b/src/MmCommonUtils.cpp
index 8bc87be..be8b0de 100644 (file)
--- a/src/MmCommonUtils.cpp
+++ b/src/MmCommonUtils.cpp
@@ -392,8 +392,20 @@ void AddFooterMenuItem(Footer* pFooter, ButtonItem& menuItem)
 void RefreshEditListScene(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->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);
+       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MEMO_LIST), pArgs);*/
 }

diff --git a/src/MmDrawingDetailForm.cpp b/src/MmDrawingDetailForm.cpp
index 80914b7..32a8b1d 100644 (file)
--- a/src/MmDrawingDetailForm.cpp
+++ b/src/MmDrawingDetailForm.cpp
@@ -21,7 +21,6 @@
 
 #include <FMedia.h>
 #include <FSystem.h>
-#include <FUiITouchFlickGestureEventListener.h>
 #include "MmCommonUtils.h"
 #include "MmDataPresentationModel.h"
 #include "MmDrawingDetailForm.h"

diff --git a/src/MmListEditorForm.cpp b/src/MmListEditorForm.cpp
index f43717c..8749e61 100644 (file)
--- a/src/MmListEditorForm.cpp
+++ b/src/MmListEditorForm.cpp
@@ -313,6 +313,7 @@ MemoListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        }
                        __pPopup->SetShowState(true);
                        __pPopup->Show();
+                       SetFooterEnabled(false);
                }
                break;
 
@@ -328,6 +329,7 @@ MemoListEditorForm::OnActionPerformed(const Control& source, int actionId)
                {
                        __pPopup->SetShowState(false);
                        __pPopup->Invalidate(true);
+                       SetFooterEnabled(true);
                }
                break;
 
@@ -389,7 +391,7 @@ MemoListEditorForm::OnListViewItemStateChanged(ListView& listView, int index, in
                if (pShareMemoList != null)
                {
                        LaunchAppToShare(index, pShareMemoList,this);
-                       //static_cast<MemoApp*>(MemoApp::CreateInstance())->SetAppControlLaunchedStatus(true);
+                       static_cast<MemoApp*>(MemoApp::CreateInstance())->SetAppControlLaunchedStatus(true);
                        pShareMemoList = null;
                }
                return;

diff --git a/src/MmMemoManager.cpp b/src/MmMemoManager.cpp
index d9b3d01..b21f158 100644 (file)
--- a/src/MmMemoManager.cpp
+++ b/src/MmMemoManager.cpp
@@ -412,11 +412,11 @@ MemoManager::GetMemoListN(void)
        }
        else if(sortType == ID_SORT_BY_ATOZ)
        {
-               statement.Append(L"SELECT id,Contents,TextSize,Color,CreationTime,ModificationTime,DrawingFilePath from Memo ORDER BY Contents  LIMIT");
+               statement.Append(L"SELECT id,Contents,TextSize,Color,CreationTime,ModificationTime,DrawingFilePath from Memo ORDER BY Contents");
        }
        else
        {
-               statement.Append(L"SELECT id,Contents,TextSize,Color,CreationTime,ModificationTime,DrawingFilePath from Memo ORDER BY Contents DESC  LIMIT");
+               statement.Append(L"SELECT id,Contents,TextSize,Color,CreationTime,ModificationTime,DrawingFilePath from Memo ORDER BY Contents DESC");
        }
 
        pStmt = __pDatabase->CreateStatementN(statement);

diff --git a/src/MmTextDetailForm.cpp b/src/MmTextDetailForm.cpp
index 4be17ad..fd3a905 100644 (file)
--- a/src/MmTextDetailForm.cpp
+++ b/src/MmTextDetailForm.cpp
@@ -19,7 +19,6 @@
  * @brief      The form to display a memos.
  */
 
-#include <FUiITouchFlickGestureEventListener.h>
 #include "MmCommonUtils.h"
 #include "MmDataPresentationModel.h"
 #include "MmInfo.h"

diff --git a/src/MmTextEditorForm.cpp b/src/MmTextEditorForm.cpp
index 2f04f96..2a66fe2 100644 (file)
--- a/src/MmTextEditorForm.cpp
+++ b/src/MmTextEditorForm.cpp
@@ -793,7 +793,7 @@ void
 MemoTextEditorForm::SetTextSize(int size)
 {
        __pMemoContentEditarea->SetTextSize(size);
-       __pMemoContentEditarea->SetCursorPosition(__cursorPosition);
+       __pMemoContentEditarea->SetCursorPosition(0);
        __pMemoContentEditarea->Invalidate(false);
        __pSliderPreviewLabel->SetTextConfig(size, LABEL_TEXT_STYLE_NORMAL);
        __pSliderPreviewLabel->Invalidate(false);