Merge branch 'develop' into claudio-dev

Sankore_3.1.pro

@@ -11,7 +11,7 @@ CONFIG += debug_and_release \
 VERSION_MAJ = 2
 VERSION_MIN = 00 
 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 05
+VERSION_PATCH = 06
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")

resources/library/applications/Sel video.wgt/css/main.css

 
 body{
-    margin-top:10px;
-    margin-left:10px;
+	margin: 0;
     font-family:Arial, Sans-serif;
     font-size:15px;
     color:#444;
@@ -104,7 +103,6 @@ body{
 }
 
 #embeded-content{
-    border:1px solid rgb(230,230,230);
     position:relative;
     z-index:3;
     float:left;

resources/library/applications/Sel video.wgt/index.html

@@ -143,7 +143,7 @@
                             top:($("#embeded-content").children(":first").height()-35)/2
                         });
 										
-                        adaptWidgetSize(5, 13);					
+                        adaptWidgetSize(3, 0);					
                         return false;
                     };
 				

src/board/UBFeaturesController.h

@@ -94,6 +94,7 @@ public:
 //    UBFeature();
     virtual ~UBFeature();
     QString getName() const { return mName; }
+    QString getDisplayName() const {return mDisplayName;}
     QImage getThumbnail() const {return mThumbnail;}
     QString getVirtualPath() const { return virtualDir; }
 	//QString getPath() const { return mPath; };
@@ -112,11 +113,17 @@ public:
 	const QMap<QString,QString> & getMetadata() const { return metadata; }
 	void setMetadata( const QMap<QString,QString> &data ) { metadata = data; }
 
+
+private:
+    QString getNameFromVirtualPath(const QString &pVirtPath);
+    QString getVirtualDirFromVirtualPath(const QString &pVirtPath);
+
 private:
     QString virtualDir;
     QString virtualPath;
     QImage mThumbnail;
     QString mName;
+    QString mDisplayName;
 	QUrl mPath;
     UBFeatureElementType elementType;
     QMap<QString,QString> metadata;
@@ -182,6 +189,19 @@ public:
     void assignFeaturesListVeiw(UBFeaturesListView *pList);
     void assignPathListView(UBFeaturesListView *pList);
 
+public:
+    static const QString rootPath;
+    static const QString audiosPath;
+    static const QString moviesPath;
+    static const QString picturesPath;
+    static const QString appPath;
+    static const QString flashPath;
+    static const QString shapesPath;
+    static const QString interactPath;
+    static const QString trashPath;
+    static const QString favoritePath;
+    static const QString webSearchPath;
+
 signals:
     void maxFilesCountEvaluated(int pLimit);
     void scanStarted();
@@ -235,17 +255,7 @@ private:
 	QUrl trashDirectoryPath;
 	QUrl mLibSearchDirectoryPath;
 
-	QString rootPath;
-	QString audiosPath;
-	QString moviesPath;
-	QString picturesPath;
-	QString appPath;
-	QString flashPath;
-	QString shapesPath;
-	QString interactPath;
-	QString trashPath;
-	QString favoritePath;
-    QString webSearchPath;
+
 
 	int mLastItemOffsetIndex;
 	UBFeature currentElement;

src/core/UBApplication.cpp

@@ -233,7 +233,7 @@ void UBApplication::setupTranslator(QString forcedLanguage)
 	    mApplicationTranslator = new QTranslator(this);
 	    mQtGuiTranslator = new QTranslator(this);
 
-	    mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language));
+        mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language));
 	    installTranslator(mApplicationTranslator);
 
 

src/desktop/UBDesktopAnnotationController.cpp

@@ -66,8 +66,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
         , mDesktopStylusTool(UBDrawingController::drawingController()->stylusTool())
 {
 
-    mTransparentDrawingView = new UBBoardView(UBApplication::boardController, static_cast<QWidget*>(NULL), true); // deleted in UBDesktopAnnotationController::destructor
-
+    mTransparentDrawingView = new UBBoardView(UBApplication::boardController, static_cast<QWidget*>(0), true); // deleted in UBDesktopAnnotationController::destructor
     mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true);
 #ifdef Q_WS_MAC
     mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true);

src/gui/UBFeaturesWidget.cpp

@@ -259,7 +259,7 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
         }break;
     }
 
-    UBFeature feature( QString(), QImage(previewImageUrl), QString(), metadata["Url"], FEATURE_ITEM );
+    UBFeature feature( "/root", QImage(previewImageUrl), QString(), metadata["Url"], FEATURE_ITEM );
     feature.setMetadata( metadata );
 
     centralWidget->showElement(feature, UBFeaturesCentralWidget::FeaturePropertiesList);
@@ -1080,7 +1080,7 @@ QVariant UBFeaturesModel::data(const QModelIndex &index, int role) const
         return QVariant();
 
     if (role == Qt::DisplayRole) {
-		return featuresList->at(index.row()).getName();
+        return featuresList->at(index.row()).getDisplayName();
     }
 
     else if (role == Qt::DecorationRole) {
@@ -1311,7 +1311,7 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina
         }
     }
 
-    UBFeature newElement( destVirtualPath, sourceIcon, name, QUrl::fromLocalFile(destFullPath), sourceType );
+    UBFeature newElement( destVirtualPath + "/" + name, sourceIcon, name, QUrl::fromLocalFile(destFullPath), sourceType );
     addItem(newElement);
 
     if (deleteManualy) {

src/gui/UBTeacherGuideWidget.cpp

@@ -685,6 +685,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
     mpSessionTitle = new UBTGAdaptableText(0, this, "UBTGSessionTitle");
     mpSessionTitle->setPlaceHolderText(tr("Type session title here ..."));
     mpButtonTitleLayout->addWidget(mpSessionTitle);
+    connect(this, SIGNAL(resized()), mpSessionTitle, SLOT(onTextChanged()));
 
     mpLayout->addLayout(mpButtonTitleLayout);
 
@@ -703,6 +704,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
     mpAuthors->setObjectName("UBTGZeroPageInputText");
     mpAuthors->setPlaceHolderText(tr("Type authors here ..."));
     mpLayout->addWidget(mpAuthors);
+    connect(this, SIGNAL(resized()), mpAuthors, SLOT(onTextChanged()));
 
     mpCreationLabel = new QLabel(this);
     mpCreationLabel->setObjectName("UBTGZeroPageDateLabel");
@@ -727,6 +729,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
     mpObjectives->setObjectName("UBTGZeroPageInputText");
     mpObjectives->setPlaceHolderText(tr("Type objectives here..."));
     mpLayout->addWidget(mpObjectives);
+    connect(this, SIGNAL(resized()), mpObjectives, SLOT(onTextChanged()));
 
     mpSeparatorObjectives = new QFrame(this);
     mpSeparatorObjectives->setFixedHeight(UBTG_SEPARATOR_FIXED_HEIGHT);
@@ -747,6 +750,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
     mpKeywords = new UBTGAdaptableText(0, this);
     mpKeywords->setPlaceHolderText(tr("Type keywords here ..."));
     mpLayout->addWidget(mpKeywords);
+    connect(this, SIGNAL(resized()), mpKeywords, SLOT(onTextChanged()));
 
     mpSchoolLevelItemLabel = new QLabel(this);
     mpSchoolLevelItemLabel->setObjectName("UBTGZeroPageItemLabel");
@@ -1122,6 +1126,12 @@ bool UBTeacherGuidePageZeroWidget::isModified()
     return result;
 }
 
+void UBTeacherGuidePageZeroWidget::resizeEvent(QResizeEvent* ev){
+	emit resized();
+
+	QWidget::resizeEvent(ev);
+}
+
 /***************************************************************************
  *                    class    UBTeacherGuideWidget                        *
  ***************************************************************************/
@@ -1238,3 +1248,4 @@ bool UBTeacherGuideWidget::isModified()
     else
         return mpEditionWidget->isModified();
 }
+

src/gui/UBTeacherGuideWidget.h

@@ -136,11 +136,16 @@ public:
     QVector<tUBGEElementNode*> getData();
     bool isModified();
 
+signals:
+	void resized();
 
 public slots:
     void onActiveSceneChanged();
     void switchToMode(tUBTGZeroPageMode mode = tUBTGZeroPageMode_EDITION);
 
+protected:
+    void resizeEvent(QResizeEvent* ev);
+
 private:
     void fillComboBoxes();
     void loadData();

src/gui/UBTeacherGuideWidgetsTools.cpp

@@ -174,6 +174,7 @@ void UBTGAdaptableText::showEvent(QShowEvent* e)
     if(!mIsUpdatingSize && mHasPlaceHolder && toPlainText().isEmpty())
         setPlainText(mPlaceHolderText);
     else
+    	// If the teacherguide is collapsed, don't updated the size. Or set the size as the expanded size
         onTextChanged();
 }
 
@@ -188,9 +189,12 @@ QString UBTGAdaptableText::text()
 
 void UBTGAdaptableText::onTextChanged()
 {
+	qDebug() << ">> onTextChanged CALLED!";
     qreal documentSize = document()->size().height();
-    if(height() == documentSize + mBottomMargin)
-        return;
+    qDebug() << ">>  documentSize: " << documentSize << ", height: " << height();
+    if(height() == documentSize + mBottomMargin){
+    	return;
+    }
     mIsUpdatingSize = true;
 
 
@@ -208,6 +212,7 @@ void UBTGAdaptableText::onTextChanged()
         setFocus();
     }
     mIsUpdatingSize = false;
+
 }
 void UBTGAdaptableText::setInitialText(const QString& text)
 {