NABI issue Fixes

Change-Id: I1a1bf75783ab901f41bae6ca5f9144955aff2bb0

diff --git a/inc/MfCreateFolderForm.h b/inc/MfCreateFolderForm.h
index 6a947e3..cedbc26 100644 (file)
--- a/inc/MfCreateFolderForm.h
+++ b/inc/MfCreateFolderForm.h
@@ -44,6 +44,7 @@ class CreateFolderForm
        , public Tizen::Ui::IKeypadEventListener
        , public Tizen::Ui::ITextEventListener
        , public Tizen::Ui::ITouchEventListener
+       , public Tizen::Io::IFileEventListener
 {
 public:
        //Constructor of the class.
@@ -102,6 +103,9 @@ public:
        // Call back is called On Changes in Device Status
        void OnDeviceChange(ComponentType deviceType, const Tizen::Base::String& state);
 
+       //IFileEventListener
+       virtual void OnFileEventOccured(const unsigned long events,const Tizen::Base::String &  path, const unsigned int eventId);
+
 private:
        // Copy Constructor of the class.
        CreateFolderForm(const CreateFolderForm& createFolderForm);
@@ -151,6 +155,7 @@ private:
        Tizen::Ui::Controls::HeaderItem* __pHeaderSave;
        Tizen::Ui::Controls::EditField* __pEditFieldFolderName;
        Tizen::Ui::Controls::Header* __pHeader;
+       Tizen::Io::FileEventManager* __pFileEventManager;
 
        Tizen::Ui::Controls::Popup* _pFileProgressingPopup;
        Tizen::Ui::Controls::Button* _pFileProgressingCancelButton;

diff --git a/inc/MfDetailsForm.h b/inc/MfDetailsForm.h
index 99b57f2..7755529 100644 (file)
--- a/inc/MfDetailsForm.h
+++ b/inc/MfDetailsForm.h
@@ -128,6 +128,7 @@ private:
        Tizen::Base::Collection::ArrayList* __pFileHeaderDetailList;\r
 \r
        Tizen::Base::String __fileFullPath;\r
+       Tizen::Base::String __previousSceneId;\r
 \r
        Tizen::Ui::Controls::GroupedListView* __pGroupedDetailListView;\r
 \r

diff --git a/inc/MfTypes.h b/inc/MfTypes.h
index 632b043..26cca12 100644 (file)
--- a/inc/MfTypes.h
+++ b/inc/MfTypes.h
@@ -150,6 +150,7 @@ extern const wchar_t* IDB_HTML;
 extern const wchar_t* IDB_UNKNOWN;
 extern const wchar_t* IDB_TPK;
 extern const wchar_t* IDB_VCARD;
+extern const wchar_t* IDB_VCALENDAR;
 
 //Category Icon
 //extern const wchar_t* IDB_CATEGORY_ICON_BG;

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index 49d2fb9..5ecc625 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -26,6 +26,7 @@ CategorySearch::CategorySearch(void)
 
 CategorySearch::~CategorySearch(void)
 {
+       DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD,*this);
        if (__pHomeButton != null)
        {
                delete __pHomeButton;
@@ -400,6 +401,8 @@ CategorySearch::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScen
        if(_pFileEventManager != null)
                _pFileEventManager->RemovePath(_pathOfSelectedFile);
 
+       DeviceManager::RemoveAllDeviceEventListeners();
+
        if (_pIconListView != null)
        {
                _pIconListView->RemoveGestureDetector(*_pLongPressGestureDetector);
@@ -415,6 +418,7 @@ CategorySearch::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::SceneId &pr
        SceneManager::GetInstance()->RemoveSceneManagerEventListener(*this);
        CreateItemSource sourceForm = CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM;
        ((MyFilesApp*) Application::GetInstance())->SetCurrentView(this);
+       FolderNavigationPresentationModel::SetStorageType(MEMORY_TYPE_NONE);
 
        if (_pFolderEntryPM != null)
        {

diff --git a/src/MfCreateFolderForm.cpp b/src/MfCreateFolderForm.cpp
index 1f47e04..980581d 100644 (file)
--- a/src/MfCreateFolderForm.cpp
+++ b/src/MfCreateFolderForm.cpp
@@ -46,6 +46,7 @@ CreateFolderForm::CreateFolderForm(void)
 , __pHeaderSave(null)
 , __pEditFieldFolderName(null)
 , __pHeader(null)
+, __pFileEventManager(null)
 , _pFileProgressingPopup(null)
 {
        entryIsDirectory = 0;
@@ -70,6 +71,13 @@ CreateFolderForm::~CreateFolderForm(void)
        {
                delete _pFileProgressingPopup;
        }
+
+       if(__pFileEventManager != null)
+       {
+               __pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+               delete __pFileEventManager;
+               __pFileEventManager = null;
+       }
 }
 
 CreateFolderForm::CreateFolderForm(const CreateFolderForm& createFolderForm)
@@ -138,7 +146,6 @@ CreateFolderForm::OnInitializing(void)
 
        __previousFormPath = FolderNavigationPresentationModel::GetCurrentPath();
        __previousFormTab = FolderNavigationPresentationModel::GetStorageType();
-       __previousSceneId = SceneManager::GetInstance()->GetCurrentSceneId();
 
        __pFooter = GetFooter();
        if (__pFooter != null)
@@ -201,6 +208,15 @@ CreateFolderForm::OnInitializing(void)
        __pFileManager = FolderEntryEditorPresentationModel::GetInstance();
        TryCatch(__pFileManager != null, , "Failed to allocate file manager");
 
+       if(__pFileEventManager == null)
+       {
+               __pFileEventManager = new (std::nothrow)FileEventManager();
+               __pFileEventManager->Construct(*this);
+
+               __pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE);
+               AppLogDebug("AddListener:%s:%S", GetErrorMessage(GetLastResult()), FolderNavigationPresentationModel::GetCurrentPath().GetPointer());
+
+       }
        return r;
 
        CATCH:
@@ -305,7 +321,7 @@ CreateFolderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
                                                String msgString;
                                                //String invalidCharacterString;
                                                AppResource::GetInstance()->GetString(L"IDS_CREATE_FOLDER_FAILED", msgString);
-                                               errorMessage.Construct(L"", msgString, MSGBOX_STYLE_NONE, 1000);
+                                               errorMessage.Construct(L"", msgString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
                                        }
                                        FolderNavigationPresentationModel::SetCurrentFilePath(filePath);
                                        TransitionScene();
@@ -327,7 +343,7 @@ CreateFolderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
                                                AppResource::GetInstance()->GetString(L"IDS_NAME_CANT_EMPTY", messageString);
                                        }
 
-                                       messageBox.Construct(L"", messageString, MSGBOX_STYLE_YESNO, 0);
+                                       messageBox.Construct(L"", messageString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
 
                                        // Call ShowAndWait - draw, show itself and process events
 
@@ -443,7 +459,7 @@ CreateFolderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
                                                AppResource::GetInstance()->GetString(L"IDS_NAME_CANT_EMPTY", messageString);
                                        }
 
-                                       messageBox.Construct(L"", messageString, MSGBOX_STYLE_YESNO, 0);
+                                       messageBox.Construct(L"", messageString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
 
                                        // Call ShowAndWait - draw, show itself and process events
 
@@ -682,6 +698,12 @@ CreateFolderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
                const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        DeviceManager::RemoveAllDeviceEventListeners();
+       if(__pFileEventManager != null)
+       {
+               __pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+               delete __pFileEventManager;
+               __pFileEventManager = null;
+       }
 }
 
 void
@@ -952,6 +974,7 @@ CreateFolderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen:
 void
 CreateFolderForm::OnDeviceChange(ComponentType deviceType, const Tizen::Base::String& state)
 {
+       AppLogDebug("CreateFolderForm::OnDeviceChange");
        bool setMediaPath = false;
        bool searchHistoryStatus = false;
        MemoryType currentMemoryType = MEMORY_TYPE_PHONE;
@@ -967,6 +990,11 @@ CreateFolderForm::OnDeviceChange(ComponentType deviceType, const Tizen::Base::St
 
        if (state == unmounted || state == removed)
        {
+               if (__previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
+               {
+                       SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+                       return;
+               }
                currentPath = FolderNavigationPresentationModel::GetCurrentPath();
                if (state == unmounted)
                {
@@ -1116,6 +1144,7 @@ void
 CreateFolderForm::OnSceneTransitionCompleted(const Tizen::Ui::Scenes::SceneId &previousSceneId,
                const Tizen::Ui::Scenes::SceneId &currentSceneId)
 {
+       __previousSceneId = previousSceneId;
        SceneManager::GetInstance()->RemoveSceneManagerEventListener(*this);
 }
 
@@ -1336,3 +1365,11 @@ CreateFolderForm::OnNotificationReceived(Tizen::Base::Collection::ArrayList* pAr
 
        AppLogDebug("EXIT");
 }
+
+void
+CreateFolderForm::OnFileEventOccured(const unsigned long events,const Tizen::Base::String &  path, const unsigned int  eventId)
+{
+       AppLogDebug("Enter");
+       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+       AppLogDebug("Exit");
+}

diff --git a/src/MfDetailsForm.cpp b/src/MfDetailsForm.cpp
index 2ec6f23..c85840d 100644 (file)
--- a/src/MfDetailsForm.cpp
+++ b/src/MfDetailsForm.cpp
@@ -83,6 +83,8 @@ DetailsForm::Initialize(void)
        __pFileHeaderDetailList = new (std::nothrow) ArrayList();
        r = __pFileHeaderDetailList->Construct();
 
+       __previousSceneId = L"";
+
        return true;
 }
 
@@ -805,7 +807,7 @@ DetailsForm::OnSceneTransitionCompleted(const Tizen::Ui::Scenes::SceneId &previo
                const Tizen::Ui::Scenes::SceneId &currentSceneId)
 {
        SceneManager::GetInstance()->RemoveSceneManagerEventListener(*this);
-
+       __previousSceneId = previousSceneId;
        if (__pGroupedDetailListView != null)
        {
                __pGroupedDetailListView->UpdateList();
@@ -822,7 +824,7 @@ DetailsForm::OnSceneTransitionStarted(const Tizen::Ui::Scenes::SceneId &currentS
 void
 DetailsForm::OnDeviceChange(ComponentType deviceType, const Tizen::Base::String& state)
 {
-       AppLogDebug("DetailsForm::OnDeviceChange");
+       AppLogDebug("DetailsForm::OnDeviceChange:%S", __previousSceneId.GetPointer());
 
        bool setMediaPath = false;
        bool searchHistoryStatus = false;
@@ -839,6 +841,11 @@ DetailsForm::OnDeviceChange(ComponentType deviceType, const Tizen::Base::String&
 
        if (state == unmounted || state == removed)
        {
+               if (__previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
+               {
+                       SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+                       return;
+               }
                currentPath = FolderNavigationPresentationModel::GetCurrentPath();
                if (state == unmounted)
                {

diff --git a/src/MfFileManageForm.cpp b/src/MfFileManageForm.cpp
index ce4d17f..0962961 100644 (file)
--- a/src/MfFileManageForm.cpp
+++ b/src/MfFileManageForm.cpp
@@ -322,8 +322,8 @@ FileManageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
                _pFileEventManager = new (std::nothrow)FileEventManager();
                _pFileEventManager->Construct(*this);
        }
-       AppLogDebug("current path is %ls",FolderNavigationPresentationModel::GetCurrentPath().GetPointer());
-       r = _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVED_FROM);
+       _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVED_FROM);
+
        AppLogDebug("Exit %s", GetErrorMessage(r));
        return;
 
@@ -341,7 +341,15 @@ void
 FileManageForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
+       AppLogDebug("Enter");
        DeviceManager::RemoveAllDeviceEventListeners();
+       if(_pFileEventManager != null)
+       {
+               _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+               delete _pFileEventManager;
+               _pFileEventManager = null;
+       }
+
        ((MyFilesApp*)Application::GetInstance())->SetCurrentView(null);
        _pFolderEntryPM->StopThumbnailManager(true);
 }
@@ -436,6 +444,7 @@ FileManageForm::OnFileManagingStart(void)
 void
 FileManageForm::OnFileManagingStop(FileManagingResult fileManagingResult)
 {
+       AppLogDebug("FileManageForm::OnFileManagingStop");
        HideFileProgressingPopup();
 
        switch (fileManagingResult)

diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index 2a04af6..477a51e 100644 (file)
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -135,6 +135,7 @@ SubBaseFileManageForm::~SubBaseFileManageForm(void)
        }
        if(_pFileEventManager != null)
        {
+               _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
                delete _pFileEventManager;
                _pFileEventManager = null;
        }
@@ -205,7 +206,12 @@ SubBaseFileManageForm::SubBaseOnActionPerformed(const Tizen::Ui::Control& source
                {
                        if (_pFileManager->GetCheckedListCount() > 0)
                        {
-                               _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+                               if (_pFileEventManager != null)
+                               {
+                                       _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+                                       delete _pFileEventManager;
+                                       _pFileEventManager = null;
+                               }
                                AppLogDebug("remove path result %s",GetErrorMessage(GetLastResult()));
                                SetFooterVisibility(DISABLE_FOOTER_ITEM);
                                ShowFileProgressingPopup();
@@ -575,10 +581,12 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
                {
                        listView.SetItemChecked(index, false);
                }
-
-               _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
-               delete _pFileEventManager;
-               _pFileEventManager = null;
+               if (_pFileEventManager != null)
+               {
+                       _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
+                       delete _pFileEventManager;
+                       _pFileEventManager = null;
+               }
                LoadRenameForm(index);
 
                return;
@@ -1351,7 +1359,15 @@ SubBaseFileManageForm::SubBaseOnNotificationReceived(Tizen::Base::Collection::Ar
        case FILE_MANAGING_RESULT_DELETING_SUCCESS:
        {
                HideFileProgressingPopup();
-               _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE);
+               if(_pFileEventManager == null)
+               {
+                       _pFileEventManager = new (std::nothrow)FileEventManager();
+                       _pFileEventManager->Construct(*this);
+
+                       _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE);
+
+               }
+
                if (_pFileManager != null)
                        _pFileManager->ClearCheckedList();
 
@@ -1377,7 +1393,14 @@ SubBaseFileManageForm::SubBaseOnNotificationReceived(Tizen::Base::Collection::Ar
        case FILE_MANAGING_RESULT_DELETING_FAILED:
        {
                HideFileProgressingPopup();
-               _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE);
+               if(_pFileEventManager == null)
+               {
+                       _pFileEventManager = new (std::nothrow)FileEventManager();
+                       _pFileEventManager->Construct(*this);
+
+                       _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(),FILE_EVENT_TYPE_DELETE);
+
+               }
                String deleteFailed;
                AppResource* pAppResource = null;
                pAppResource = Application::GetInstance()->GetAppResource();

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index 8a65d10..0e6c3c8 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -1466,7 +1466,10 @@ SubFolderFileListForm::OnFileEventOccured(const unsigned long events,const Tizen
                }
                if (_pFolderEntryPM!=null)
                {
-                       _pFolderEntryPM->RefreshFolderEntries();
+                        if ( (events & FILE_EVENT_TYPE_DELETE) || (events & FILE_EVENT_TYPE_MOVED_FROM) )
+                                _pFilenames->RemoveAt(_indexTracker);
+                        else
+                                _pFolderEntryPM->RefreshFolderEntries();
                }
 
                if (_pListView != null && _pListView->IsVisible())

diff --git a/src/MfThumbnailManager.cpp b/src/MfThumbnailManager.cpp
index 4d2fdf2..5d6db9b 100644 (file)
--- a/src/MfThumbnailManager.cpp
+++ b/src/MfThumbnailManager.cpp
@@ -247,9 +247,12 @@ ThumbnailManager::GetThumbnail(ThumbRequest* pRequest)
                pBitmapToMerge = null;
        }
 
+       AppLogDebug("Exit [%s]:", GetErrorMessage(r));
        return thumbMgrRes;
+
 CATCH:
-       AppLogDebug("Exit [%s]:", GetErrorMessage(r));
+
+       AppLogDebug("Exit Error Message[%s]:", GetErrorMessage(r));
 
        if (pRequest != null)
        {
@@ -405,74 +408,66 @@ ThumbnailManager::MakeBitmapN(const Tizen::Base::String& FilePath, bool& makeThu
        break;
        case CONTENT_TYPE_OTHER:
        {
+               makeThumbnail = false;
+               bVideo = false;
                if (FilePath.EndsWith(L"pdf") || FilePath.EndsWith(L"PDF"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_PDF, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"doc") || FilePath.EndsWith(L"DOC"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_WORD, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"docx") || FilePath.EndsWith(L"DOCX"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_WORD, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"xls") || FilePath.EndsWith(L"XLS"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_EXCEL, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"xlsx") || FilePath.EndsWith(L"XLSX"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_EXCEL, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"ppt") || FilePath.EndsWith(L"PPT"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_PPT, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"pptx") || FilePath.EndsWith(L"PPTX"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_MS_PPT, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"html") || FilePath.EndsWith(L"HTML") || FilePath.EndsWith(L"htm") ||
                                FilePath.EndsWith(L"HTM") || FilePath.EndsWith(L"JS") || FilePath.EndsWith(L"js"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_HTML, pixelFormat);
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"rss") || FilePath.EndsWith(L"RSS"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_RSS, pixelFormat);
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"txt") || FilePath.EndsWith(L"TXT"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_TEXT, pixelFormat);
                        return pTempBitmap;
                }
@@ -480,34 +475,35 @@ ThumbnailManager::MakeBitmapN(const Tizen::Base::String& FilePath, bool& makeThu
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_SVG, pixelFormat);
-                       makeThumbnail = false;
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"swf") || FilePath.EndsWith(L"SWF"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_SWF, pixelFormat);
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"tpk") || FilePath.EndsWith(L"TPK"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_TPK, pixelFormat);
                        return pTempBitmap;
                }
                else if (FilePath.EndsWith(L"VCF") || FilePath.EndsWith(L"vcf"))
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_VCARD, pixelFormat);
                        return pTempBitmap;
                }
+               else if (FilePath.EndsWith(L"vcs") || FilePath.EndsWith(L"VCS"))
+               {
+                       pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
+                       pTempBitmap = pAppResource->GetBitmapN(IDB_VCALENDAR, pixelFormat);
+                       return pTempBitmap;
+               }
                else
                {
                        pixelFormat = BITMAP_PIXEL_FORMAT_ARGB8888;
-                       makeThumbnail = false;
                        pTempBitmap = pAppResource->GetBitmapN(IDB_UNKNOWN, pixelFormat);
                        return pTempBitmap;
                }
@@ -559,6 +555,7 @@ CATCH:
                delete pTempBitmap;
                pTempBitmap = null;
        }
+       AppLogDebug("EXIT: Error Message [%s]", GetErrorMessage(r));
        return null;
 }
 result

diff --git a/src/MfTypes.cpp b/src/MfTypes.cpp
index 284a257..ea6c288 100644 (file)
--- a/src/MfTypes.cpp
+++ b/src/MfTypes.cpp
@@ -129,6 +129,7 @@ const wchar_t* IDB_HTML = L"U01_icon_html.png";
 const wchar_t* IDB_UNKNOWN = L"U01_icon_unkown.png";
 const wchar_t* IDB_TPK = L"U01_list_icon_tpk-file.png";
 const wchar_t* IDB_VCARD = L"U01_list_icon_Vcard.png";
+const wchar_t* IDB_VCALENDAR = L"U01_list_icon_Vcalendar.png";
 
 //Category Icon
 const wchar_t* IDB_POPUP_SORTBY_ICON = L"U01_popup_icon_sort_by.png";