diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 5b50c471..456739b7 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -262,7 +262,7 @@ QList UBLibraryController::rootCategoriesList() element->setMoveable(false); categories << element; - mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->applicationGipLibraryDirectory()); + mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->userGipLibraryDirectory()); element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactivities", "Interactives category element")); element->setThumbnail(QImage(":images/libpalette/InteractivesCategory.svg")); element->setMoveable(false); diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index a664a5a5..ae2ee1e3 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -150,7 +150,7 @@ QStringList UBPersistenceManager::allShapes() QStringList UBPersistenceManager::allGips() { - QString gipLibraryPath = UBSettings::settings()->applicationGipLibraryDirectory(); + QString gipLibraryPath = UBSettings::settings()->userGipLibraryDirectory(); QDir dir(gipLibraryPath); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index b8450d19..63c9f57c 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -882,6 +882,17 @@ QString UBSettings::userTrashDirPath() } +QString UBSettings::userGipLibraryDirectory() +{ + static QString dirPath = ""; + if(dirPath.isEmpty()){ + dirPath = userDataDirectory() + "/library/gips"; + checkDirectory(dirPath); + } + return dirPath; +} + + QString UBSettings::applicationShapeLibraryDirectory() { QString defaultRelativePath = QString("./library/shape"); @@ -896,16 +907,6 @@ QString UBSettings::applicationShapeLibraryDirectory() } } -QString UBSettings::applicationGipLibraryDirectory() -{ - static QString dirPath = ""; - if(dirPath.isEmpty()){ - dirPath = UBPlatformUtils::applicationResourcesDirectory() + "/library/gips"; - checkDirectory(dirPath); - } - return dirPath; -} - QString UBSettings::userSearchDirectory() { static QString dirPath = ""; diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index c928b6fa..fc873db3 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -113,9 +113,10 @@ class UBSettings : public QObject static QString userInteractiveFavoritesDirectory(); static QString userPodcastRecordingDirectory(); - //application directory + QString userGipLibraryDirectory(); + + //application directory QString applicationShapeLibraryDirectory(); - QString applicationGipLibraryDirectory(); QString applicationImageLibraryDirectory(); QString applicationApplicationsLibraryDirectory(); QString applicationInteractivesDirectory(); diff --git a/src/web/browser/WBWebView.cpp b/src/web/browser/WBWebView.cpp index b58fbddd..c6996e34 100644 --- a/src/web/browser/WBWebView.cpp +++ b/src/web/browser/WBWebView.cpp @@ -187,7 +187,7 @@ void WBWebPage::handleUnsupportedContent(QNetworkReply *reply) if (!isPDF && reply->error() == QNetworkReply::NoError) { if(contentType == "application/widget") - WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply,false, UBSettings::settings()->applicationGipLibraryDirectory()); + WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply,false, UBSettings::settings()->userGipLibraryDirectory()); else WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply); return;