From de0e3ab3ec823526dfe1382cbd3c0f1939cfa0cf Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 May 2011 15:58:04 +0200 Subject: [PATCH] - Resolved issue "Sankore-7" - Modified the document path - Removed a warning --- src/board/UBLibraryController.cpp | 1 + src/frameworks/UBDesktopServices_mac.cpp | 8 +++----- src/gui/UBLibActionBar.cpp | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 1374e5d4..5cd94b91 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -374,6 +374,7 @@ QList UBLibraryController::listElementsInPath(const QString& pPat QList UBLibraryController::listElementsInVirtualForlder(UBLibElement* pElement) { + Q_UNUSED(pElement); return mFavoriteList; } diff --git a/src/frameworks/UBDesktopServices_mac.cpp b/src/frameworks/UBDesktopServices_mac.cpp index c2a54bdd..472973a7 100644 --- a/src/frameworks/UBDesktopServices_mac.cpp +++ b/src/frameworks/UBDesktopServices_mac.cpp @@ -70,8 +70,7 @@ QString UBDesktopServices::storageLocation(StandardLocation type) short domain = kOnAppropriateDisk; - if (QDesktopServices::DataLocation == type - || QDesktopServices::CacheLocation == type) + if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type) domain = kUserDomain; // http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html @@ -82,9 +81,8 @@ QString UBDesktopServices::storageLocation(StandardLocation type) QString path = getFullPath(ref); - if (QDesktopServices::DataLocation == type - || QDesktopServices::CacheLocation == type) - path += "/" + QCoreApplication::applicationName(); + if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type) + path += "/Sankore"; return path; } diff --git a/src/gui/UBLibActionBar.cpp b/src/gui/UBLibActionBar.cpp index d02e36f6..7359cb64 100644 --- a/src/gui/UBLibActionBar.cpp +++ b/src/gui/UBLibActionBar.cpp @@ -397,7 +397,10 @@ void UBLibActionBar::dropEvent(QDropEvent *event) } else if(mpDeleteBtn == pTargetW) { - onActionTrash(); + if(mpDeleteBtn->isEnabled()) + { + onActionTrash(); + } } else if(mpSocialBtn == pTargetW) {