Nabi issue fix for .ico image

[apps/osp/ImageViewer.git] / src / IvImageViewerForm.cpp

diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index ccef395..3f44086 100644 (file)
--- a/src/IvImageViewerForm.cpp
+++ b/src/IvImageViewerForm.cpp
@@ -228,7 +228,6 @@ ImageViewerForm::OnInitializing(void)
                AddControl(__pPopUp);
        }
 
-
        if (__initializeDisplayModeCurrent == APPCONTROL_MODE_NORMAL
                        || __initializeDisplayModeCurrent == APPCONTROL_MODE_MESSAGE
                        || __initializeDisplayModeCurrent == APPCONTROL_MODE_EMAIL)
@@ -1565,6 +1564,20 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
        case IDA_CONTEXTMENU_HOME:
        {
                String filePath = __pPresentationModel->GetFilePathAt(__pGallery->GetCurrentItemIndex());
+               ImageBuffer imageBuffer;
+               result r = imageBuffer.Construct(filePath);
+
+               if (r != E_SUCCESS)
+               {
+                       MessageBox messageBox;
+                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_UNSUPPORTED_FILE_TYPE"), MSGBOX_STYLE_NONE, 3000);
+                       int modalResult = 0;
+                       messageBox.ShowAndWait(modalResult);
+                       UiApp* pApp = UiApp::GetInstance();
+                       pApp->Terminate();
+                       return;
+               }
+
                if (File::IsFileExist(filePath))
                {
                        String cropMode = APPCONTROL_DATA_FIT_TO_SCREEN;
@@ -1590,6 +1603,20 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
        case IDA_CONTEXTMENU_LOCK:
        {
                String filePath = __pPresentationModel->GetFilePathAt(__pGallery->GetCurrentItemIndex());
+               ImageBuffer imageBuffer;
+               result r = imageBuffer.Construct(filePath);
+
+               if (r != E_SUCCESS)
+               {
+                       MessageBox messageBox;
+                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_UNSUPPORTED_FILE_TYPE"), MSGBOX_STYLE_NONE, 3000);
+                       int modalResult = 0;
+                       messageBox.ShowAndWait(modalResult);
+                       UiApp* pApp = UiApp::GetInstance();
+                       pApp->Terminate();
+                       return;
+               }
+
                if (File::IsFileExist(filePath))
                {
                        String cropMode = APPCONTROL_DATA_FIT_TO_SCREEN;
@@ -1621,6 +1648,12 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
                result r = imagebuffer.Construct(filePath);
                if (r != E_SUCCESS)
                {
+                       MessageBox messageBox;
+                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_UNSUPPORTED_FILE_TYPE"), MSGBOX_STYLE_NONE, 3000);
+                       int modalResult = 0;
+                       messageBox.ShowAndWait(modalResult);
+                       UiApp* pApp = UiApp::GetInstance();
+                       pApp->Terminate();
                        return;
                }
                int imageWidth = imagebuffer.GetWidth();
@@ -1651,6 +1684,20 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
        case IDA_CONTEXTMENU_HOME_AND_LOCK:
        {
                String filePath = __pPresentationModel->GetFilePathAt(__pGallery->GetCurrentItemIndex());
+               ImageBuffer imageBuffer;
+               result r = imageBuffer.Construct(filePath);
+
+               if (r != E_SUCCESS)
+               {
+                       MessageBox messageBox;
+                       messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_UNSUPPORTED_FILE_TYPE"), MSGBOX_STYLE_NONE, 3000);
+                       int modalResult = 0;
+                       messageBox.ShowAndWait(modalResult);
+                       UiApp* pApp = UiApp::GetInstance();
+                       pApp->Terminate();
+                       return;
+               }
+
                if (File::IsFileExist(filePath))
                {
                        String cropMode = APPCONTROL_DATA_FIT_TO_SCREEN;