Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

resources/library/interactivities/Contraste.wgt/css/basic.css

@@ -140,6 +140,7 @@ body{
     text-align: center;
     font-family: Verdana,Arial,Helvetica,sans-serif;
     font-weight: bold;
+    font-size:24px;
 }
 
 .editContainer{

src/board/UBBoardView.cpp

@@ -948,6 +948,7 @@ bool UBBoardView::isAbsurdPoint(QPoint point)
     }
     return !isValidPoint;
 #else
+	Q_UNUSED(point);
     return false;
 #endif
 }

src/board/UBLibraryController.cpp

@@ -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);

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);
 

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 = "";

src/core/UBSettings.h

@@ -113,9 +113,10 @@ class UBSettings : public QObject
         static QString userInteractiveFavoritesDirectory();
         static QString userPodcastRecordingDirectory();
 
+		QString userGipLibraryDirectory();
+        
 		//application directory
         QString applicationShapeLibraryDirectory();
-        QString applicationGipLibraryDirectory();
         QString applicationImageLibraryDirectory();
         QString applicationApplicationsLibraryDirectory();
         QString applicationInteractivesDirectory();

src/web/UBWebController.cpp

@@ -211,6 +211,8 @@ void UBWebController::tutorialWebInstance()
             (*mCurrentWebBrowser)->tabWidget()->lineEdits()->hide();
 
         }
+        else
+        	(*mCurrentWebBrowser)->loadUrl(currentUrl);
 
         UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget());
 

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;