NABI_SE issues fixed

Change-Id: I966c08b08f9bfdd4f9d086b120be0f3c79a17d2f

diff --git a/inc/MfTypes.h b/inc/MfTypes.h
index ff18306..662a6cf 100644 (file)
--- a/inc/MfTypes.h
+++ b/inc/MfTypes.h
@@ -90,6 +90,7 @@ extern const wchar_t* sdCardStatusUnmounted;
 
 //Bitmaps
 extern const wchar_t* IDB_MORE;
+extern const wchar_t* IDB_MORE_DISABLED;
 extern const wchar_t* IDB_MORE_PRESS;
 
 //Category

diff --git a/res/screen-density-xhigh/00_icon_more_status_normal.png b/res/screen-density-xhigh/00_icon_more_status_normal.png
new file mode 100644 (file)
index 0000000..49a6d06
Binary files /dev/null and b/res/screen-density-xhigh/00_icon_more_status_normal.png differ

diff --git a/src/MfBaseItemProvider.cpp b/src/MfBaseItemProvider.cpp
index abb9911..91a1a08 100644 (file)
--- a/src/MfBaseItemProvider.cpp
+++ b/src/MfBaseItemProvider.cpp
@@ -700,6 +700,19 @@ BaseItemProvider::SetSourceForm(CreateItemSource sourceInfo)
                        __pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_RENAME_PRESSED_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
                }
        }
+#if 0
+       else if (__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+       {
+               if (__pSecondaryBitmap == null)
+               {
+                       __pSecondaryBitmap = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG, IDB_CATEGORY_GO_TO_LOCATION, W_RENAME_ICON, W_RENAME_ICON);
+               }
+               if (__pSecondaryBitmapPressed == null)
+               {
+                       __pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED, IDB_CATEGORY_GO_TO_LOCATION_PRESSED, W_RENAME_ICON, W_RENAME_ICON);
+               }
+       }
+#endif
 
 return;
 CATCH:

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index 41c7a11..dbd7013 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -247,7 +247,7 @@ CategorySearch::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listVi
 
        _indexTracker  = index;
 //     if (elementId == CONTENT_LIST_ITEM_TYPE_RENAME || elementId == DETAILED_LIST_ELEMENTS_RENAME)
-       if (status == LIST_ITEM_STATUS_MORE)
+       if (status == LIST_ITEM_STATUS_MORE/* || elementId == DETAILED_LIST_ELEMENTS_RENAME*/)
        {
                if (pArgs == null)
                {

diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index d651860..8a3828d 100644 (file)
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -769,6 +769,7 @@ SubBaseFileManageForm::CreateFooterControls(void)
        String btnShare;
        String btnCancel;
        Bitmap* pBitmap = null;
+       Bitmap* pBitmapDisabled = null;
        Bitmap* pBitmapPress = null;
        AppResource* pAppResource = null;
 
@@ -778,6 +779,10 @@ SubBaseFileManageForm::CreateFooterControls(void)
                pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", btnShare);
                pAppResource->GetString(L"IDS_COM_POP_CANCEL", btnCancel);
                pAppResource->GetString(L"IDS_MF_SK3_DELETE", btnDelete);
+               pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);
+               pBitmapDisabled = pAppResource->GetBitmapN(IDB_MORE_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888);
+               pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
+
        }
        _pButtonItemMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_BTN_MORE);
 
@@ -789,18 +794,15 @@ SubBaseFileManageForm::CreateFooterControls(void)
        _pShare->Construct(IDA_BTN_SHARE);
        _pShare->SetText(btnShare);
 
-       if (pAppResource != null)
-       {
-               pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);
-               pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
-       }
-
        TryCatch(pBitmap != null, , "MfMyFilesApp::Bitmap pBitmap null");
+       TryCatch(pBitmapDisabled != null, , "MfMyFilesApp::Bitmap pBitmapDisabled null");
        TryCatch(pBitmapPress != null, , "MfMyFilesApp::Bitmap pBitmapPress null");
 
        pBitmap->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
        _pButtonItemMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmap);
 
+       pBitmapDisabled->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
+       _pButtonItemMore.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapDisabled);
 
        pBitmapPress->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
        _pButtonItemMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);
@@ -826,6 +828,10 @@ CATCH:
        {
                delete pBitmap;
        }
+       if (pBitmapDisabled != null)
+       {
+               delete pBitmapDisabled;
+       }
        return;
 }
 

diff --git a/src/MfSubBaseFolderEntryForm.cpp b/src/MfSubBaseFolderEntryForm.cpp
index 292e4fc..cda4e90 100644 (file)
--- a/src/MfSubBaseFolderEntryForm.cpp
+++ b/src/MfSubBaseFolderEntryForm.cpp
@@ -193,6 +193,7 @@ SubBaseFolderEntryForm::CreateFooterControls(void)
        ButtonItem footerItemMenu;
 
        Bitmap* pBitmap = null;
+       Bitmap* pBitmapDisabled = null;
        Bitmap* pBitmapPress = null;
 
        pAppResource = Application::GetInstance()->GetAppResource();
@@ -201,6 +202,9 @@ SubBaseFolderEntryForm::CreateFooterControls(void)
        {
                pAppResource->GetString(L"IDS_MF_SK3_EDIT", buttonEdit);
                pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", buttonShare);
+               pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);
+               pBitmapDisabled = pAppResource->GetBitmapN(IDB_MORE_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888);
+               pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
 
        }
        footerItemMenu.Construct(BUTTON_ITEM_STYLE_ICON, IDA_BTN_MORE);
@@ -218,21 +222,17 @@ SubBaseFolderEntryForm::CreateFooterControls(void)
                _pShare = new (std::nothrow) FooterItem();
                _pShare->Construct(IDA_BTN_SHARE);
                _pShare->SetText(buttonShare);
-
-       }
-
-       if (pAppResource != null)
-       {
-               pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);
-               pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
        }
 
        TryCatch(pBitmap != null, , "MfMyFilesApp::Bitmap pBitmap null");
+       TryCatch(pBitmapDisabled != null, , "MfMyFilesApp::Bitmap pBitmapDisabled null");
        TryCatch(pBitmapPress != null, , "MfMyFilesApp::Bitmap pBitmapPress null");
 
        pBitmap->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
        footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmap);
 
+       pBitmapDisabled->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
+       footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapDisabled);
 
        pBitmapPress->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
        footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);
@@ -259,6 +259,7 @@ SubBaseFolderEntryForm::CreateFooterControls(void)
 
        delete pBitmap;
        delete pBitmapPress;
+       delete pBitmapDisabled;
 
        return r;
 
@@ -268,6 +269,11 @@ CATCH:
        {
                delete pBitmap;
        }
+       if (pBitmapDisabled != null)
+       {
+               delete pBitmapDisabled;
+       }
+
        return r;
 }
 
@@ -2211,7 +2217,10 @@ void
 SubBaseFolderEntryForm::OnLongPressGestureDetected(Tizen::Ui::TouchLongPressGestureDetector& gestureDetector)
 {
        //Show Context Menu
-       ShowIconListViewContextMenu();
+       if (_currentIndex != INVALID_LIST_INDEX)
+       {
+               ShowIconListViewContextMenu();
+       }
 }
 
 void

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index a9c557e..cae40c0 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -927,6 +927,7 @@ SubFolderFileListForm::ShowParentDirectoryView(void)
        {
                ParentPath = FolderNavigationPresentationModel::GetParentPath();
 
+               //RemovePath to remove FileEventListener
                if(_pFileEventManager != null)
                {
                        _pFileEventManager->RemovePath(__currentDirectoryPath);
@@ -934,6 +935,12 @@ SubFolderFileListForm::ShowParentDirectoryView(void)
                __currentDirectoryPath.Clear();
                __currentDirectoryPath.Append(ParentPath);
 
+               //AddPath to add FileEventListener for Parent Directory Path
+               if(_pFileEventManager != null)
+               {
+                       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE );
+               }
+
                FolderNavigationPresentationModel::SetCurrentFilePath(__currentDirectoryPath);
 
                if (_pFolderEntryPM != null)
@@ -1032,7 +1039,7 @@ SubFolderFileListForm::OnNotificationReceived(Tizen::Base::Collection::ArrayList
        break;
        }
 
-       //SetFooterVisibility(DISABLE_FOOTER_ITEM);
+       SetFooterVisibility(DISABLE_FOOTER_ITEM);
 CATCH:
        if (pArgs != null)
        {

diff --git a/src/MfSubFolderMoveCopy.cpp b/src/MfSubFolderMoveCopy.cpp
index 1486907..51ca7c2 100644 (file)
--- a/src/MfSubFolderMoveCopy.cpp
+++ b/src/MfSubFolderMoveCopy.cpp
@@ -1011,6 +1011,8 @@ SubFolderMoveCopy::CreateFooterItems(void)
 
        Bitmap* pBitmap = null;
        Bitmap* pBitmapPress = null;
+       Bitmap* pBitmapDisabled = null;
+
        AppResource* pAppResource = null;
        pAppResource = Application::GetInstance()->GetAppResource();
        TryCatch(pAppResource != null, , "Resource manager not found!");
@@ -1023,7 +1025,9 @@ SubFolderMoveCopy::CreateFooterItems(void)
        _pFooter = GetFooter();
 
        pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);
+       pBitmapDisabled = pAppResource->GetBitmapN(IDB_MORE_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888);
        pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);
+
        if (pBitmap != null)
        {
                pBitmap->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
@@ -1034,7 +1038,11 @@ SubFolderMoveCopy::CreateFooterItems(void)
                pBitmapPress->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
                footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);
        }
-
+       if (pBitmapDisabled != null)
+       {
+               pBitmapDisabled->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));
+               footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapDisabled);
+       }
        if (_pFooter != null)
        {
                _pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
@@ -1095,6 +1103,7 @@ SubFolderMoveCopy::CreateFooterItems(void)
 
        delete pBitmap;
        delete pBitmapPress;
+       delete pBitmapDisabled;
        AppLogDebug("EXIT: r = %s", GetErrorMessage(r));
        return;
 CATCH:

diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index d84d6e7..e56834e 100644 (file)
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -119,6 +119,7 @@ SubFolderSelection::OnInitializing(void)
        Bitmap* pBitmapUpButtonPress = null;\r
        Bitmap* pBitmap = null;\r
        Bitmap* pBitmapPress = null;\r
+       Bitmap* pBitmapDisabled = null;\r
 \r
        __pReceivedFilename = new (std::nothrow) String();\r
 \r
@@ -150,6 +151,7 @@ SubFolderSelection::OnInitializing(void)
        //pAppResource->GetString(L"IDS_MF_TAB_UP", buttonUp);\r
        pBitmap = pAppResource->GetBitmapN(IDB_MORE, BITMAP_PIXEL_FORMAT_ARGB8888);\r
        pBitmapPress = pAppResource->GetBitmapN(IDB_MORE_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);\r
+       pBitmapDisabled = pAppResource->GetBitmapN(IDB_MORE_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888);\r
        pBitmapHomeButton = pAppResource->GetBitmapN(IDB_HOME_BUTTON_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);\r
        pBitmapUpButton = pAppResource->GetBitmapN(IDB_UP_BUTTON_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);\r
        pBitmapHomeButtonPress = pAppResource->GetBitmapN(IDB_HOME_BUTTON_ICON_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888);\r
@@ -180,6 +182,11 @@ SubFolderSelection::OnInitializing(void)
                        pBitmapPress->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));\r
                        footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);\r
                }\r
+               if (pBitmapDisabled != null)\r
+               {\r
+                       pBitmapDisabled->Scale(Dimension(H_FOOTER_BUTTON_MORE, W_FOOTER_BUTTON_MORE));\r
+                       footerItemMenu.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapDisabled);\r
+               }\r
                if (_pFooter != null)\r
                {\r
                        _pFooter->GetPosition(xPos, yPos);\r
@@ -303,6 +310,9 @@ SubFolderSelection::OnInitializing(void)
        delete pBitmapUpButton;\r
        delete pBitmapHomeButtonPress;\r
        delete pBitmapUpButtonPress;\r
+       delete pBitmapDisabled;\r
+       delete pBitmap;\r
+       delete pBitmapPress;\r
        AppLogDebug("Exit: %s", GetErrorMessage(r));\r
        return r;\r
 \r

diff --git a/src/MfTypes.cpp b/src/MfTypes.cpp
index f9101ba..6ab2a29 100644 (file)
--- a/src/MfTypes.cpp
+++ b/src/MfTypes.cpp
@@ -62,7 +62,8 @@ const wchar_t* sdCardStatusMounted = L"Mounted";
 const wchar_t* sdCardStatusUnmounted = L"Unmounted";
 
 //Bitmaps
-const wchar_t* IDB_MORE = L"00_icon_more_ef.png";
+const wchar_t* IDB_MORE = L"00_icon_more_status_normal.png";
+const wchar_t* IDB_MORE_DISABLED = L"00_icon_more_ef.png";
 const wchar_t* IDB_MORE_PRESS = L"00_icon_more.png";
 
 //Popup