Nabi issues resolution

Change-Id: Ib341c2122910dc9c924cf47e3e2553d8d240cba7
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/inc/StMainMenuForm.h b/inc/StMainMenuForm.h
index 8ac24a0..acd4e19 100644 (file)
--- a/inc/StMainMenuForm.h
+++ b/inc/StMainMenuForm.h
@@ -40,7 +40,6 @@ private:
 
 class MainMenuForm
        : public BaseForm
-       , public Tizen::Ui::IFocusEventListener
 {
 public:
        MainMenuForm(void);
@@ -73,9 +72,6 @@ public:
        virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
-       virtual void OnFocusGained(const Tizen::Ui::Control& source);
-       virtual void OnFocusLost(const Tizen::Ui::Control& source);
-
 private:
        void FindAppControlScene(int itemIndex);
        void SetIFlightModeSetValueAsyncResultListener(void);
@@ -88,7 +84,6 @@ private:
 private:
        int __currentTableViewList;
        bool __isEmulator;
-       bool __isRunningAppControl;
        Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
 
 private:

diff --git a/inc/StTypes.h b/inc/StTypes.h
index 174fe83..01ee203 100644 (file)
--- a/inc/StTypes.h
+++ b/inc/StTypes.h
@@ -349,5 +349,6 @@ extern const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK;
 
 extern const wchar_t* NO_CONTENTS;
 extern const wchar_t* NO_CONTENTS_TEXT;
+extern const wchar_t* PATH_DATA_DIRECTORY;
 
 #endif // _ST_TYPES_H_
\ No newline at end of file

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 2e8f8bf..61816c5 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -111,7 +111,6 @@ IFlightModeSetValueAsyncResultListener::OnResultReceivedForSetValueAsync(const T
 
 MainMenuForm::MainMenuForm(void)
        : __currentTableViewList(0)
-       , __isRunningAppControl(false)
        , __pFlightModeSetValueAsyncResultListener(null)
 {
 }
@@ -140,8 +139,6 @@ MainMenuForm::OnInitializing(void)
        CreateTableView();
        __isEmulator = IsEmulator();
 
-       AddFocusEventListener(*this);
-
        return E_SUCCESS;
 }
 
@@ -997,12 +994,6 @@ MainMenuForm::IsEmulator(void)
 void
 MainMenuForm::FindAppControlScene(int itemIndex)
 {
-       if (__isRunningAppControl)
-       {
-               AppLogDebug("busy status");
-               return;
-       }
-
        String providerId;
        String operationId = APPCONTROL_OPERATION_ID_CONFIGURE;
 
@@ -1037,7 +1028,12 @@ MainMenuForm::FindAppControlScene(int itemIndex)
                        pAppControl->Start(pDataList, null);
                        delete pAppControl;
 
-                       __isRunningAppControl = true;
+                       Frame* pCurrentFrame = null;
+                       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
+                       if (pCurrentFrame != null)
+                       {
+                               pCurrentFrame->SetEnabled(false);
+                       }
                }
        }
 
@@ -1095,13 +1091,3 @@ MainMenuForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::
        Invalidate(true);
 }
 
-void
-MainMenuForm::OnFocusGained(const Tizen::Ui::Control& source)
-{
-       __isRunningAppControl = false;
-}
-
-void
-MainMenuForm::OnFocusLost(const Tizen::Ui::Control& source)
-{
-}
\ No newline at end of file

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index 045a9b2..ffc9428 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -836,7 +836,7 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
        __pProgressPopup->SetTitleText(applicationName);
        __pProgressPopup->SetBounds(clientRect);
 
-       descriptionText = ResourceManager::GetString(L"IDS_ST_BODY_DELETE");
+       descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
        descriptionText.Append(L"....");
        __pProgressPopup->SetText(descriptionText);
 

diff --git a/src/StSettingsApp.cpp b/src/StSettingsApp.cpp
index 5fca9b8..a7ff38f 100644 (file)
--- a/src/StSettingsApp.cpp
+++ b/src/StSettingsApp.cpp
@@ -115,6 +115,12 @@ void
 SettingsApp::OnForeground(void)
 {
        AppLogDebug("Foreground");
+       Frame* pCurrentFrame = null;
+       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
+       if (pCurrentFrame != null)
+       {
+               pCurrentFrame->SetEnabled(true);
+       }
        Form* pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
        pCurrentForm->SendUserEvent(FRFRESH_REQUEST_EVENT, null);
 }

diff --git a/src/StTypes.cpp b/src/StTypes.cpp
index 586300f..311c13d 100644 (file)
--- a/src/StTypes.cpp
+++ b/src/StTypes.cpp
@@ -340,4 +340,5 @@ const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN = L"http://tizen.org/setting/sc
 const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK = L"http://tizen.org/setting/screen.wallpaper.lock";
 
 const wchar_t* NO_CONTENTS = L"NoContents";
-const wchar_t* NO_CONTENTS_TEXT = L"NoContentsText";
\ No newline at end of file
+const wchar_t* NO_CONTENTS_TEXT = L"NoContentsText";
+const wchar_t* PATH_DATA_DIRECTORY = L"data/";

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index 68c7bb1..69cea46 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -472,7 +472,7 @@ WallpaperAlbumListDetailForm::OnAppControlCompleteResponseReceived(const AppId&
                                                IList* pValueList = dynamic_cast<IList*>(pEnum->GetValue());
                                                if (pValueList)
                                                {
-                                                       String dstPath = Application::GetInstance()->GetAppDataPath();
+                                                       String dstPath = Application::GetInstance()->GetAppSharedPath() + PATH_DATA_DIRECTORY;
                                                        String srcPath = L"";
                                                        String srcFileExtention = L"";
                                                        String* pSrcPath = dynamic_cast<String*>(pValueList->GetAt(0));

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
index dbeaf16..03d8278 100644 (file)
--- a/src/StWallpaperImageSelectForm.cpp
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -136,7 +136,7 @@ WallpaperImageSelectForm::OnActionPerformed(const Tizen::Ui::Control& source, in
                                return;
                        }
 
-                       String dstPath = Application::GetInstance()->GetAppDataPath();
+                       String dstPath = Application::GetInstance()->GetAppSharedPath() + PATH_DATA_DIRECTORY;
                        String srcPath = pImageContentInfo->GetContentPath();
                        String srcFileExtention = File::GetFileExtension(srcPath);