Fized zira issues 32745 , 32859

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

diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index 818a9fa..57a8bd8 100644 (file)
--- a/src/IvImageViewerForm.cpp
+++ b/src/IvImageViewerForm.cpp
@@ -811,7 +811,7 @@ ImageViewerForm::InitializeContextMenuSetAs(void)
                        ACTION_ID_CONTEXTMENU_HOME);
        __pContextMenuSetAs->AddItem(ResourceManager::GetString(L"IDS_IV_HEADER_LOCK_SCREEN_WALLPAPER_ABB"),
                        ACTION_ID_CONTEXTMENU_LOCK);
-       __pContextMenuSetAs->AddItem(ResourceManager::GetString(L"IDS_IV_POP_SET_WALLPAPER_FOR_HOME_SCREEN_AND_LOCK_SCREEN"),
+       __pContextMenuSetAs->AddItem(ResourceManager::GetString(L"IDS_IV_BODY_HOME_AND_LOCK_SCREENS"),
                        ACTION_ID_CONTEXTMENU_HOME_AND_LOCK);
        __pContextMenuSetAs->AddItem(ResourceManager::GetString(L"IDS_IV_BODY_CALLER_IMAGE"),
                        ACTION_ID_CONTEXTMENU_CALLER);
@@ -2219,11 +2219,21 @@ ImageViewerForm::OnSlideSettingPopUpItemSelected(int index)
 
        if (index == 0)   // start slide show
        {
-               int repeatValue = 0;
+       int repeatValue = 0;
+
+               int interval = 0 ;
+
 
                if (__pPresentationModel->GetFileCount() > 1)
                {
                        int shuffleValue;
+                       __pSettingPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
+                                                                       ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, interval);
+
+                               interval = interval * 1000;
+                       AppLogDebug("The slide interval is %d", interval);
+                               __pGallery->SetSlideShowViewDuration(interval);
+
 
                        __pGallery->UpdateGallery();
 

diff --git a/src/IvSettingPresentationModel.cpp b/src/IvSettingPresentationModel.cpp
index cce435e..39598bc 100644 (file)
--- a/src/IvSettingPresentationModel.cpp
+++ b/src/IvSettingPresentationModel.cpp
@@ -73,27 +73,7 @@ SettingPresentationModel::Construct(void)
 {
        AppLogDebug("ENTER");
 
-       String valueRegistryString = L"";
-       AppManager* pAppManager = AppManager::GetInstance();
-       TryReturn(pAppManager != null, E_FAILURE, "Failed to get AppManager");
-       String pathGallerySetting =
-                       pAppManager->GetAppSharedPath(GALLERY_APP_ID) + PATH_DATA_DIRECTORY + PATH_GALLERY_SETTINGS;
-       if (GetLastResult() == E_APP_NOT_INSTALLED)
-       {
-               AppLogDebug("GETSHAREPATH(The expected shared directory cannot be found because the application specified "
-                               "with appId cannot be installed.)");
-       }
-       else
-       {
-               AppLogDebug("GETSHAREPATH(%ls)",pathGallerySetting.GetPointer());
-       }
-
-       if (File::IsFileExist(pathGallerySetting))
-       {
-               AppLogDebug("Already exist camcorder settings file");
-               __pAppGalleryRegistry = new (nothrow) Registry();
-               __pAppGalleryRegistry->Construct(pathGallerySetting, "r");
-       }
+       __pAppGalleryRegistry = new (nothrow) Registry();
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -133,6 +113,18 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
+       String valueRegistryString = L"";
+       AppManager* pAppManager = AppManager::GetInstance();
+       TryReturn(pAppManager != null, E_FAILURE, "Failed to get AppManager");
+       String pathGallerySetting =
+                       pAppManager->GetAppSharedPath(GALLERY_APP_ID) + PATH_DATA_DIRECTORY + PATH_GALLERY_SETTINGS;
+
+       if (File::IsFileExist(pathGallerySetting))
+       {
+               AppLogDebug("Already exist camcorder settings file");
+               __pAppGalleryRegistry->Construct(pathGallerySetting, "r");
+       }
+
        if (__pAppGalleryRegistry != null)
        {
                r = __pAppGalleryRegistry->GetValue(strSectionName, entryName, value);
@@ -147,6 +139,18 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
+       String valueRegistryString = L"";
+       AppManager* pAppManager = AppManager::GetInstance();
+       TryReturn(pAppManager != null, E_FAILURE, "Failed to get AppManager");
+       String pathGallerySetting =
+                       pAppManager->GetAppSharedPath(GALLERY_APP_ID) + PATH_DATA_DIRECTORY + PATH_GALLERY_SETTINGS;
+
+       if (File::IsFileExist(pathGallerySetting))
+       {
+               AppLogDebug("Already exist camcorder settings file");
+               __pAppGalleryRegistry->Construct(pathGallerySetting, "r");
+       }
+
        if (__pAppGalleryRegistry != null)
        {
                r = __pAppGalleryRegistry->GetValue(strSectionName, entryName, value);