Merge branch 'develop' into Ilia_dev

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

src/web/UBWebController.cpp

@@ -733,6 +733,7 @@ bool UBWebController::isEduMedia(const QUrl& pUrl)
 
 void UBWebController::loadUrl(const QUrl& url)
 {
+	bool webBrowserAlreadyInstanciated = dynamic_cast<WBBrowserWindow*>(mStackedWidget->widget(WebBrowser)) != NULL;
 	UBApplication::applicationController->showInternet();
     if (UBSettings::settings()->webUseExternalBrowser->get().toBool())
     {
@@ -740,8 +741,6 @@ void UBWebController::loadUrl(const QUrl& url)
     }
     else
     {
-    	bool webBrowserAlreadyInstanciated = mStackedWidget->widget(WebBrowser) != NULL;
-
         if (!webBrowserAlreadyInstanciated) {
             (*mCurrentWebBrowser)->loadUrl(url);
         }

src/web/browser/WBBrowserWindow.cpp

@@ -270,28 +270,6 @@ void WBBrowserWindow::setupToolBarForTutorial()
         if (tb && tb->menu())
             tb->setMenu(NULL);
     }
-//    mTabWidget->addWebAction(mUniboardMainWindow->actionWebReload, QWebPage::Reload);
-//    mTabWidget->addWebAction(mUniboardMainWindow->actionStopLoading, QWebPage::Stop);
-
-//    mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mTabWidget->lineEditStack());
-
-//    mSearchToolBar = new WBToolbarSearch(mWebToolBar);
-
-//    mSearchAction = mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mSearchToolBar);
-
-//    connect(mSearchToolBar, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
-
-//    mChaseWidget = new WBChaseWidget(this);
-//    mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mChaseWidget);
-
-//    mWebToolBar->insertSeparator(mUniboardMainWindow->actionWebBigger);
-
-//    connect(mUniboardMainWindow->actionHome, SIGNAL(triggered()), this , SLOT(slotHome()));
-
-//    connect(mUniboardMainWindow->actionBookmarks, SIGNAL(triggered()), this , SLOT(bookmarks()));
-//    connect(mUniboardMainWindow->actionAddBookmark, SIGNAL(triggered()), this , SLOT(addBookmark()));
-//    connect(mUniboardMainWindow->actionWebBigger, SIGNAL(triggered()), this , SLOT(slotViewZoomIn()));
-//    connect(mUniboardMainWindow->actionWebSmaller, SIGNAL(triggered()), this , SLOT(slotViewZoomOut()));
 
     mWebToolBar->show();
 }
@@ -662,4 +640,4 @@ void WBBrowserWindow::openActionUrl(QAction *action)
         history->goToItem(history->backItems(-1*offset).first()); 
     else if (offset > 0)
         history->goToItem(history->forwardItems(history->count() - offset + 1).back()); 
- }
\ No newline at end of file
+ }