From 3dd7628f281550f8b859453cfb83d28921e69959 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Wed, 31 Oct 2012 15:13:58 +0300 Subject: [PATCH] Fixed lost icons for favorite c++ tools. --- src/board/UBFeaturesController.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 2af9526f..593b2404 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -566,7 +566,7 @@ void UBFeaturesController::addToFavorite( const QUrl &path ) { QFileInfo fileInfo( filePath ); QString fileName = fileInfo.fileName(); - UBFeatureElementType type = fileTypeFromUrl(fileInfo.absoluteFilePath()); + UBFeatureElementType type = fileTypeFromUrl(filePath); UBFeature elem(favoritePath + "/" + fileName, getIcon(filePath, type), fileName, path, fileTypeFromUrl(filePath) ); favoriteSet->insert( path ); saveFavoriteList(); @@ -603,15 +603,17 @@ UBFeatureElementType UBFeaturesController::fileTypeFromUrl(const QString &path) { QFileInfo fileInfo(path); + if ( path.contains("uniboardTool://")) + return FEATURE_INTERNAL; + if (!fileInfo.exists()) { return FEATURE_INVALID; } + UBFeatureElementType fileType = FEATURE_INVALID; QString fileName = fileInfo.fileName(); QString mimeString = UBFileSystemUtils::mimeTypeFromFileName(fileName); - UBFeatureElementType fileType = FEATURE_INVALID; - if ( mimeString.contains("application")) { if (mimeString.contains("application/search")) { fileType = FEATURE_SEARCH; @@ -620,8 +622,6 @@ UBFeatureElementType UBFeaturesController::fileTypeFromUrl(const QString &path) } else { fileType = FEATURE_INTERACTIVE; } - } else if ( path.contains("uniboardTool://")) { - fileType = FEATURE_INTERNAL; } else if (mimeString.contains("audio")) { fileType = FEATURE_AUDIO; } else if (mimeString.contains("video")) {