Commit 7d13b1f0 authored by Claudio Valerio's avatar Claudio Valerio

changed gips directory because it doesn't work on windows. Installation path...

changed gips directory because it doesn't work on windows. Installation path isn't available on write mode
parent 20340234
......@@ -262,7 +262,7 @@ QList<UBLibElement*> 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);
......
......@@ -150,7 +150,7 @@ QStringList UBPersistenceManager::allShapes()
QStringList UBPersistenceManager::allGips()
{
QString gipLibraryPath = UBSettings::settings()->applicationGipLibraryDirectory();
QString gipLibraryPath = UBSettings::settings()->userGipLibraryDirectory();
QDir dir(gipLibraryPath);
......
......@@ -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 = "";
......
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment