From 32a944b1614105e57c8d2b5339a34aa2ec124e93 Mon Sep 17 00:00:00 2001 From: "chitta.rs" Date: Thu, 18 Apr 2013 18:41:16 +0530 Subject: [PATCH] NABI_SE issues fixed Change-Id: Id299026c29f4b420004926f81f1c8f8857ccd534 --- res/screen-size-normal/IDL_DELETE_POPUP.xml | 26 ++++++++++++++------------ res/screen-size-normal/IDL_SORT_BY_POPUP.xml | 14 +++++++------- res/screen-size-normal/IDL_VIEW_AS_POPUP.xml | 15 ++++++++------- src/MfCreateFolderForm.cpp | 1 + src/MfFileManageWorkerThread.cpp | 2 +- src/MfFolderEntryPresentationModel.cpp | 2 +- src/MfSearchForm.cpp | 14 +------------- src/MfSearchPresentationModel.cpp | 1 + src/MfThumbnailItemProviderAndListener.cpp | 25 ++++++++++++++++++------- src/MfTypes.cpp | 2 +- 10 files changed, 53 insertions(+), 49 deletions(-) diff --git a/res/screen-size-normal/IDL_DELETE_POPUP.xml b/res/screen-size-normal/IDL_DELETE_POPUP.xml index a66571e..9d2c59c 100644 --- a/res/screen-size-normal/IDL_DELETE_POPUP.xml +++ b/res/screen-size-normal/IDL_DELETE_POPUP.xml @@ -3,25 +3,27 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - + - - + + + + diff --git a/res/screen-size-normal/IDL_SORT_BY_POPUP.xml b/res/screen-size-normal/IDL_SORT_BY_POPUP.xml index 639c36d..72830dd 100644 --- a/res/screen-size-normal/IDL_SORT_BY_POPUP.xml +++ b/res/screen-size-normal/IDL_SORT_BY_POPUP.xml @@ -6,17 +6,17 @@ - - + + - - + + diff --git a/res/screen-size-normal/IDL_VIEW_AS_POPUP.xml b/res/screen-size-normal/IDL_VIEW_AS_POPUP.xml index 6a751ab..5e91c5f 100644 --- a/res/screen-size-normal/IDL_VIEW_AS_POPUP.xml +++ b/res/screen-size-normal/IDL_VIEW_AS_POPUP.xml @@ -6,17 +6,18 @@ - - + + - - + + + diff --git a/src/MfCreateFolderForm.cpp b/src/MfCreateFolderForm.cpp index b3551f5..c5d01ea 100644 --- a/src/MfCreateFolderForm.cpp +++ b/src/MfCreateFolderForm.cpp @@ -583,6 +583,7 @@ CreateFolderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc if (__pEditFieldFolderName != null) { __pEditFieldFolderName->SetText(__pDirectory->GetFileName()); + __textLength = __pDirectory->GetFileName().GetLength(); } entryIsDirectory = 1; } diff --git a/src/MfFileManageWorkerThread.cpp b/src/MfFileManageWorkerThread.cpp index fcc66fa..f3cdeab 100644 --- a/src/MfFileManageWorkerThread.cpp +++ b/src/MfFileManageWorkerThread.cpp @@ -1880,7 +1880,7 @@ FileManageWorkerThread::RenameFolderEntry(void) bool isScanFailed = false; r = Directory::Rename(__filePath,__renameFilePath); - TryCatch(r == E_SUCCESS,,"Rename file failed"); + TryCatch(r == E_SUCCESS,,"Rename file failed:%s", GetErrorMessage(r)); File::GetAttributes(__renameFilePath, fileAttrib); AppLogDebug("file path is %ls", __renameFilePath.GetPointer()); diff --git a/src/MfFolderEntryPresentationModel.cpp b/src/MfFolderEntryPresentationModel.cpp index 46336d1..19c1257 100644 --- a/src/MfFolderEntryPresentationModel.cpp +++ b/src/MfFolderEntryPresentationModel.cpp @@ -1081,7 +1081,7 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma if ((pCacheList->GetValue(cacheImagePath)) == null) { cachePath = new (std::nothrow) String(pDirEntry->GetFullFilePath()); - if (cachePath != null && pThumb != null) + if (cachePath != null) __pCacheManager->AddCacheEntry(*cachePath,pThumb); } } diff --git a/src/MfSearchForm.cpp b/src/MfSearchForm.cpp index accbda9..d42ca06 100644 --- a/src/MfSearchForm.cpp +++ b/src/MfSearchForm.cpp @@ -151,7 +151,6 @@ SearchForm::OnInitializing(void) result r = E_SUCCESS; String cancelButton(L""); - Bitmap* pMainLabelBg = null; Bitmap* pDeleteNormalBmp = null; Bitmap* pDeletePressBmp = null; String renameButtonText; @@ -271,12 +270,6 @@ SearchForm::OnInitializing(void) delete pDeletePressBmp; pDeletePressBmp = null; } - - if (pMainLabelBg != null) - { - delete pMainLabelBg; - pMainLabelBg = null; - } AppLogDebug("Exit"); return r; @@ -299,8 +292,6 @@ CATCH: delete pDeletePressBmp; - delete pMainLabelBg; - AppLogDebug("EXIT::SearchForm::OnInitializing"); return r; } @@ -1707,10 +1698,9 @@ SearchForm::OnSceneTransitionCompleted(const Tizen::Ui::Scenes::SceneId &previou const Tizen::Ui::Scenes::SceneId ¤tSceneId) { SceneManager::GetInstance()->RemoveSceneManagerEventListener(*this); -// __pSearchBar->SetText(L""); __pSearchBar->SetMode(__searchBarMode); - + FolderNavigationPresentationModel::SetCurrentFilePath(__previousFormPath); if (__pFileEventManager != null) { delete __pFileEventManager; @@ -1720,8 +1710,6 @@ SearchForm::OnSceneTransitionCompleted(const Tizen::Ui::Scenes::SceneId &previou __pFileEventManager = new (std::nothrow) FileEventManager(); __pFileEventManager->Construct(*this); - //__pFileEventManager->AddPath(__currentSearchDirectoryPath, FILE_EVENT_TYPE_ATTRIBUTE | FILE_EVENT_TYPE_DELETE ); - if (__bCheckArgsNull) { if (__pListView != null) diff --git a/src/MfSearchPresentationModel.cpp b/src/MfSearchPresentationModel.cpp index a7028a4..4add0fe 100644 --- a/src/MfSearchPresentationModel.cpp +++ b/src/MfSearchPresentationModel.cpp @@ -119,6 +119,7 @@ SearchPresentationModel::StopSearch(void) { AppLogDebug("Enter:SearchPresentationModel::StopSearch"); __searchToStop = true; + __isSDCardSearchedAlready = false; } void diff --git a/src/MfThumbnailItemProviderAndListener.cpp b/src/MfThumbnailItemProviderAndListener.cpp index aea3ab3..ed07c0a 100644 --- a/src/MfThumbnailItemProviderAndListener.cpp +++ b/src/MfThumbnailItemProviderAndListener.cpp @@ -187,17 +187,28 @@ ThumbnailItemProviderAndListener::OnIconListViewItemStateChanged(Tizen::Ui::Cont if (__sourceForm != THUMBNAIL_PROVIDER_SOURCEID_SUB_MOVE_COPY_FORM && __sourceForm != THUMBNAIL_PROVIDER_SOURCEID_TOP_MOVE_COPY_FORM) { - pCustomAppControl = CustomAppControl::GetInstance(); + if (_pathOfSelectedFile.EndsWith(L".tpk") || _pathOfSelectedFile.EndsWith(L".wgt")) + { + String* pFileUriScheme = new (std::nothrow) String(L"file://"); + pFileUriScheme->Append(_pathOfSelectedFile); - if (pCustomAppControl != null) + AppControl::FindAndStart(L"http://tizen.org/appcontrol/operation/view", pFileUriScheme, null, null, null, null); + delete pFileUriScheme; + } + else { - __counter = index; + pCustomAppControl = CustomAppControl::GetInstance(); + + if (pCustomAppControl != null) + { + __counter = index; - pCustomAppControl->SetAppControlListener(null); + pCustomAppControl->SetAppControlListener(null); - AppControl* pAppControlInUse = pCustomAppControl->LaunchAppControl(_pathOfSelectedFile); - if (pAppControlInUse != null) - CustomAppControl::SetAppControlInUse(pAppControlInUse); + AppControl* pAppControlInUse = pCustomAppControl->LaunchAppControl(_pathOfSelectedFile); + if (pAppControlInUse != null) + CustomAppControl::SetAppControlInUse(pAppControlInUse); + } } } } diff --git a/src/MfTypes.cpp b/src/MfTypes.cpp index d5c2334..9a6091d 100644 --- a/src/MfTypes.cpp +++ b/src/MfTypes.cpp @@ -165,7 +165,7 @@ const int X_DEFAULT = 0; const int Y_DEFAULT = 0; const int X_LISTVIEW = 16; const int Y_LISTVIEW = 10; -const int H_ITEM_LISTVIEW_POPUP = 85; +const int H_ITEM_LISTVIEW_POPUP = 112; const int H_ITEM_LISTVIEW = 112; const int H_DETAIL_LISTVIEW = 128; const int H_CATEGORY_PANEL = 122; -- 2.7.4