backup of the teacherbar rework

src/gui/UBTBDocumentEditWidget.cpp

@@ -86,3 +86,13 @@ void UBTBDocumentEditWidget::onPreview()
 {
     emit changeTBState(eTeacherBarState_DocumentPreview);
 }
+
+void UBTBDocumentEditWidget::updateFields()
+{
+
+}
+
+void UBTBDocumentEditWidget::clearFields()
+{
+
+}

src/gui/UBTBDocumentEditWidget.h

@@ -15,6 +15,8 @@ class UBTBDocumentEditWidget : public QWidget
 public:
     UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentEditWidget");
     ~UBTBDocumentEditWidget();
+    void updateFields();
+    void clearFields();
 
 signals:
     void changeTBState(eTeacherBarState state);

src/gui/UBTBDocumentPreviewWidget.cpp

@@ -46,3 +46,12 @@ void UBTBDocumentPreviewWidget::onPageView()
     emit changeTBState(eTeacherBarState_PagePreview);
 }
 
+void UBTBDocumentPreviewWidget::updateFields()
+{
+
+}
+
+void UBTBDocumentPreviewWidget::clearFields()
+{
+
+}

src/gui/UBTBDocumentPreviewWidget.h

@@ -12,6 +12,8 @@ class UBTBDocumentPreviewWidget : public QWidget
 public:
     UBTBDocumentPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentPreviewWidget");
     ~UBTBDocumentPreviewWidget();
+    void updateFields();
+    void clearFields();
 
 signals:
     void changeTBState(eTeacherBarState state);

src/gui/UBTBPageEditWidget.cpp

@@ -25,6 +25,8 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p
 {
     Q_UNUSED(name);
     mpDataMgr = pDataMgr;
+    mActions.clear();
+    mUrls.clear();
     setAttribute(Qt::WA_StyledBackground, true);
     setStyleSheet(UBApplication::globalStyleSheet());
 
@@ -93,6 +95,7 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p
     mLayout.addLayout(&mPagePreviewLayout, 0);
 
     connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged()));
+    connect(mpComments, SIGNAL(textChanged()), this, SLOT(onValueChanged()));
     connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton()));
     connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton()));
     connect(mpDocumentEditbutton, SIGNAL(clicked()), this, SLOT(onDocumentEditClicked()));
@@ -126,14 +129,14 @@ void UBTBPageEditWidget::onValueChanged()
 void UBTBPageEditWidget::onActionButton()
 {
     UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this);
-    mpDataMgr->actions() << pAction;
+    mActions << pAction;
     mpActions->addWidget(pAction);
 }
 
 void UBTBPageEditWidget::onLinkButton()
 {
     UBUrlWidget* pUrl = new UBUrlWidget(this);
-    mpDataMgr->urls() << pUrl;
+    mUrls << pUrl;
     mpLinks->addWidget(pUrl);
 }
 
@@ -143,91 +146,87 @@ void UBTBPageEditWidget::onMediaDropped(const QString &url)
         QWidget* pMedia = mpMediaContainer->generateMediaWidget(url);
         if(NULL != pMedia){
             mpDataMgr->medias() << pMedia;
+            mpDataMgr->addMediaUrl(url);
             mpMediaContainer->addWidget(pMedia);
         }
     }
 }
 
-
+void UBTBPageEditWidget::onDocumentEditClicked()
-void UBTBPageEditWidget::saveInfos(sTeacherBarInfos *infos)
 {
-    if(NULL != infos){
+    emit changeTBState(eTeacherBarState_DocumentEdit);
-        infos->title = mpTitle->text();
-
-        // Actions
-        for(int i=0; i<mpDataMgr->actions().size(); i++){
-            infos->actions << QString("%0;%1").arg(mpDataMgr->actions().at(i)->comboValue()).arg(mpDataMgr->actions().at(i)->text());
-        }
-        // Media
-        foreach(QString media, mpMediaContainer->mediaUrls()){
-            infos->medias << media;
 }
 
-        // Links
+void UBTBPageEditWidget::onPagePreviewClicked()
-        for(int j=0; j<mpDataMgr->urls().size(); j++){
+{
-            if("" != mpDataMgr->urls().at(j)->url()){
+    emit changeTBState(eTeacherBarState_PagePreview);
-                infos->urls << mpDataMgr->urls().at(j)->url();
 }
+
+void UBTBPageEditWidget::saveFields()
+{
+    mpDataMgr->actions()->clear();
+    mpDataMgr->urls()->clear();
+    foreach(UBTeacherStudentAction* pAct, mActions){
+        sAction action;
+        action.type = pAct->comboValue().toInt();
+        action.content = pAct->text();
+        mpDataMgr->actions()->append(action);
     }
-        // Comments
+    foreach(UBUrlWidget* pUrl, mUrls){
-        infos->comments = mpComments->document()->toPlainText();
+        sLink link;
+        link.title = pUrl->title();
+        link.link = pUrl->url();
+        mpDataMgr->urls()->append(link);
     }
+
+    // TODO : Medias
 }
 
-void UBTBPageEditWidget::loadInfos(sTeacherBarInfos* infos)
+void UBTBPageEditWidget::updateFields()
 {
-    if(NULL != infos){
+    mpTitle->setText(mpDataMgr->pageTitle());
-        // Title
+    qDebug() << "mpComments will become: " << mpDataMgr->comments();
-        mpTitle->setText(infos->title);
-        mpDataMgr->setPageTitle(infos->title);
 
-        // Actions
+    foreach(sAction action, *mpDataMgr->actions()){
-        for(int i=0; i<infos->actions.size(); i++){
-            QStringList qslAction = infos->actions.at(i).split(";");
-            if(qslAction.size() >= 2){
         UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this);
-                pAction->setComboValue(qslAction.at(0).toInt());
+        pAction->setComboValue(action.type);
-                pAction->setText(qslAction.at(1));
+        pAction->setText(action.content);
-                mpDataMgr->actions() << pAction;
+        mActions << pAction;
         mpActions->addWidget(pAction);
     }
-        }
-        // Media
-        foreach(QString url, infos->medias){
-            if("" != url){
-                QWidget* pMedia = mpMediaContainer->generateMediaWidget(url);
-                if(NULL != pMedia){
-                    mpDataMgr->medias() << pMedia;
-                    mpMediaContainer->addWidget(pMedia);
-                }
-            }
-        }
 
-        // Links
+    foreach(sLink link, *mpDataMgr->urls()){
-        for(int j=0; j<infos->urls.size(); j++){
+        UBUrlWidget* urlWidget = new UBUrlWidget(this);
-            QString qsUrl = infos->urls.at(j);
+        urlWidget->setTitle(link.title);
-            if("" != qsUrl){
+        urlWidget->setUrl(link.link);
-                UBUrlWidget* pLink = new UBUrlWidget(this);
+        mUrls << urlWidget;
-                pLink->setUrl(qsUrl);
+        mpLinks->addWidget(urlWidget);
-                mpDataMgr->urls() << pLink;
-                mpLinks->addWidget(pLink);
-            }
-        }
-        // Comments
-        if(NULL != mpComments){
-            mpComments->document()->setPlainText(infos->comments);
-        }
     }
+
+    // TODO: add the medias
+
+    qDebug() << "mpComments will become: " << mpDataMgr->comments();
+    mpComments->setPlainText(mpDataMgr->comments());
 }
 
-void UBTBPageEditWidget::onDocumentEditClicked()
+void UBTBPageEditWidget::clearFields()
 {
-    emit changeTBState(eTeacherBarState_DocumentEdit);
+    mpTitle->setText("");
+    mpComments->setText("");
+    foreach(UBTeacherStudentAction* pAction, mActions){
+        mpActions->removeWidget(pAction);
+        DELETEPTR(pAction);
     }
+    mActions.clear();
+
+    foreach(UBUrlWidget* pLink, mUrls){
+        mpLinks->removeWidget(pLink);
+        DELETEPTR(pLink);
+    }
+    mUrls.clear();
+
+    // TODO: clean the media?
 
-void UBTBPageEditWidget::onPagePreviewClicked()
-{
-    emit changeTBState(eTeacherBarState_PagePreview);
 }
 
 // ---------------------------------------------------------------------------------------------
@@ -287,10 +286,8 @@ QString UBUrlWidget::url()
 
 void UBUrlWidget::setUrl(const QString &url)
 {
-    QStringList list = url.split(";");
     if(NULL != mpUrl){
-        mpUrl->setText(list.at(0));
+        mpUrl->setText(url);
-        mpTitle->setText(list.at(1));
     }
 }
 
@@ -415,3 +412,81 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url)
 
     return pW;
 }
+
+UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent)
+  , mpText(NULL)
+  , mpLayout(NULL)
+  , mpComboLayout(NULL)
+  , mpCombo(NULL)
+{
+    setObjectName(name);
+
+    setAttribute(Qt::WA_StyledBackground, true);
+    setStyleSheet(UBApplication::globalStyleSheet());
+
+    // Create the GUI
+    mpLayout = new QHBoxLayout(this);
+    setLayout(mpLayout);
+
+    mpComboLayout = new QVBoxLayout();
+
+    mpCombo = new QComboBox(this);
+    mpCombo->setObjectName("DockPaletteWidgetComboBox");
+    mpCombo->setMinimumWidth(80);
+    mpCombo->addItem(tr("Teacher"));
+    mpCombo->addItem(tr("Student"));
+    mpComboLayout->addWidget(mpCombo, 0);
+    mpComboLayout->addStretch(1);
+
+    mpLayout->addLayout(mpComboLayout, 0);
+
+    mpText = new QTextEdit(this);
+    mpText->setObjectName("DockPaletteWidgetBox");
+    mpText->setStyleSheet("background:white;");
+
+    mpLayout->addWidget(mpText, 1);
+
+}
+
+UBTeacherStudentAction::~UBTeacherStudentAction()
+{
+    DELETEPTR(mpCombo);
+    DELETEPTR(mpText);
+    DELETEPTR(mpComboLayout);
+    DELETEPTR(mpLayout);
+}
+
+QString UBTeacherStudentAction::text()
+{
+    QString str;
+    if(NULL != mpText){
+        str = mpText->document()->toPlainText();
+    }
+    return str;
+}
+
+QString UBTeacherStudentAction::comboValue()
+{
+    QString str;
+
+    if(NULL != mpCombo){
+        str = QString("%0").arg(mpCombo->currentIndex());
+    }
+
+    return str;
+}
+
+void UBTeacherStudentAction::setComboValue(int value)
+{
+    if(NULL != mpCombo){
+        mpCombo->setCurrentIndex(value);
+    }
+}
+
+void UBTeacherStudentAction::setText(const QString& text)
+{
+    if(NULL != mpText){
+        mpText->document()->setPlainText(text);
+    }
+}
+

src/gui/UBTBPageEditWidget.h

@@ -14,6 +14,48 @@
 #include "interfaces/IDropable.h"
 #include "UBTeacherBarDataMgr.h"
 
+class UBTeacherStudentAction : public QWidget
+{
+    Q_OBJECT
+
+public:
+    UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction");
+    ~UBTeacherStudentAction();
+    QString text();
+    QString comboValue();
+    void setComboValue(int value);
+    void setText(const QString& text);
+
+private:
+    QTextEdit* mpText;
+    QHBoxLayout* mpLayout;
+    QVBoxLayout* mpComboLayout;
+    QComboBox* mpCombo;
+};
+
+class UBUrlWidget : public QWidget
+{
+public:
+    UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget");
+    ~UBUrlWidget();
+
+    QString url();
+    void setUrl(const QString& url);
+
+    QString title(){return mpTitle->text();}
+    void setTitle(const QString& title){mpTitle->setText(title);}
+
+private:
+    QVBoxLayout* mpLayout;
+    QHBoxLayout* mpLabelLayout;
+    QHBoxLayout* mpTitleLayout;
+    QLabel* mpUrlLabel;
+    QLineEdit* mpUrl;
+
+    QLabel* mpTitleLabel;
+    QLineEdit* mpTitle;
+};
+
 class UBTBMediaContainer : public UBWidgetList
     , public IDropable
 {
@@ -46,9 +88,9 @@ class UBTBPageEditWidget : public QWidget
 public:
     UBTBPageEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBPageEditWidget");
     ~UBTBPageEditWidget();
-
+    void saveFields();
-    void saveInfos(sTeacherBarInfos* infos);
+    void updateFields();
-    void loadInfos(sTeacherBarInfos* infos);
+    void clearFields();
 
 signals:
     void valueChanged();
@@ -87,6 +129,9 @@ private:
     QPushButton* mpDocumentEditbutton;
     QPushButton* mpPagePreviewButton;
     QWidget* mpContainer;
+
+    QVector<UBTeacherStudentAction*> mActions;
+    QVector<UBUrlWidget*> mUrls;
 };
 
 #endif // UBTBPAGEEDITWIDGET_H

src/gui/UBTeacherBarDataMgr.cpp

@@ -1,5 +1,8 @@
 #include "core/UBApplication.h"
+#include "core/UBPersistenceManager.h"
+#include "board/UBBoardController.h"
 #include "customWidgets/UBGlobals.h"
+
 #include "UBTeacherBarDataMgr.h"
 
 UBTeacherBarDataMgr::UBTeacherBarDataMgr()
@@ -19,79 +22,75 @@ void UBTeacherBarDataMgr::clearLists()
     mMediaList.clear();
 }
 
-UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent)
+void UBTeacherBarDataMgr::saveContent()
-  , mpText(NULL)
-  , mpLayout(NULL)
-  , mpComboLayout(NULL)
-  , mpCombo(NULL)
 {
-    setObjectName(name);
+    // Store the page information in the UBZ
+    sTeacherBarInfos infos;
 
-    setAttribute(Qt::WA_StyledBackground, true);
+    infos.title = mPageTitle;
-    setStyleSheet(UBApplication::globalStyleSheet());
 
-    // Create the GUI
+    // Actions
-    mpLayout = new QHBoxLayout(this);
+    foreach(sAction action, mActionList){
-    setLayout(mpLayout);
+        infos.actions << QString("%0;%1").arg(action.type).arg(action.content);
+    }
 
-    mpComboLayout = new QVBoxLayout();
+    // Media
+    foreach(QString media, mMediaUrls){
+        infos.medias << media;
+    }
 
-    mpCombo = new QComboBox(this);
+    // Links
-    mpCombo->setObjectName("DockPaletteWidgetComboBox");
+    foreach(sLink link, mUrlList){
-    mpCombo->setMinimumWidth(80);
+        if("" != link.title && "" != link.link){
-    mpCombo->addItem(tr("Teacher"));
+            infos.urls << QString("%0;%1").arg(link.title).arg(link.link);
-    mpCombo->addItem(tr("Student"));
+        }
-    mpComboLayout->addWidget(mpCombo, 0);
+    }
-    mpComboLayout->addStretch(1);
 
-    mpLayout->addLayout(mpComboLayout, 0);
+    // Comments
+    infos.comments = mComments;
 
-    mpText = new QTextEdit(this);
+    UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos);
-    mpText->setObjectName("DockPaletteWidgetBox");
-    mpText->setStyleSheet("background:white;");
 
-    mpLayout->addWidget(mpText, 1);
+    // TODO: Store the document metadata somewhere
 
 }
 
-UBTeacherStudentAction::~UBTeacherStudentAction()
+void UBTeacherBarDataMgr::loadContent()
 {
-    DELETEPTR(mpCombo);
+    clearLists();
-    DELETEPTR(mpText);
+
-    DELETEPTR(mpComboLayout);
+    sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex());
-    DELETEPTR(mpLayout);
+
+    // Page Title
+    mPageTitle = nextInfos.title;
+    // Actions
+    foreach(QString eachAction, nextInfos.actions){
+        QStringList qslAction = eachAction.split(";");
+        if(2 <= qslAction.size()){
+            sAction action;
+            action.type = qslAction.at(0).toInt();
+            action.content = qslAction.at(1);
+            mActionList << action;
         }
-
-QString UBTeacherStudentAction::text()
-{
-    QString str;
-    if(NULL != mpText){
-        str = mpText->document()->toPlainText();
     }
-    return str;
+    // Media URL
+    mMediaUrls = nextInfos.medias;
+
+    // Links
+    foreach(QString eachUrl, nextInfos.urls){
+        QStringList qslUrl = eachUrl.split(';');
+        if(2 <= qslUrl.size()){
+            sLink link;
+            link.title = qslUrl.at(0);
+            link.link = qslUrl.at(1);
+            mUrlList << link;
         }
-
-QString UBTeacherStudentAction::comboValue()
-{
-    QString str;
-
-    if(NULL != mpCombo){
-        str = QString("%0").arg(mpCombo->currentIndex());
     }
 
-    return str;
+    // Comments
-}
+    mComments = nextInfos.comments;
 
-void UBTeacherStudentAction::setComboValue(int value)
+    // TODO : Read the document metadata file and populate the metadata infos here
-{
-    if(NULL != mpCombo){
-        mpCombo->setCurrentIndex(value);
-    }
-}
 
-void UBTeacherStudentAction::setText(const QString& text)
-{
-    if(NULL != mpText){
-        mpText->document()->setPlainText(text);
-    }
 }
+

src/gui/UBTeacherBarDataMgr.h

@@ -22,44 +22,15 @@ typedef enum{
     eActionOwner_Student
 }eActionOwner;
 
-class UBTeacherStudentAction : public QWidget
+typedef struct{
-{
+    int type;
-    Q_OBJECT
+    QString content;
-
+}sAction;
-public:
-    UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction");
-    ~UBTeacherStudentAction();
-    QString text();
-    QString comboValue();
-    void setComboValue(int value);
-    void setText(const QString& text);
-
-private:
-    QTextEdit* mpText;
-    QHBoxLayout* mpLayout;
-    QVBoxLayout* mpComboLayout;
-    QComboBox* mpCombo;
-};
 
-class UBUrlWidget : public QWidget
+typedef struct{
-{
+    QString title;
-public:
+    QString link;
-    UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget");
+}sLink;
-    ~UBUrlWidget();
-
-    QString url();
-    void setUrl(const QString& url);
-
-private:
-    QVBoxLayout* mpLayout;
-    QHBoxLayout* mpLabelLayout;
-    QHBoxLayout* mpTitleLayout;
-    QLabel* mpUrlLabel;
-    QLineEdit* mpUrl;
-
-    QLabel* mpTitleLabel;
-    QLineEdit* mpTitle;
-};
 
 class UBTeacherBarDataMgr
 {
@@ -80,13 +51,15 @@ public:
     QString pageTitle(){return mPageTitle;}
 
     // Actions
-    QVector<UBTeacherStudentAction*> actions(){return mActionList;}
+    QVector<sAction>* actions(){return &mActionList;}
 
     // Medias
     QVector<QWidget*> medias(){return mMediaList;}
+    void addMediaUrl(const QString& url){mMediaUrls << url;}
+    QStringList mediaUrls(){return mMediaUrls;}
 
     // Urls
-    QVector<UBUrlWidget*> urls(){return mUrlList;}
+    QVector<sLink>* urls(){return &mUrlList;}
 
     // Comments
     void setComments(const QString& c){mComments = c;}
@@ -94,6 +67,8 @@ public:
 
     // Others
     void clearLists();
+    void saveContent();
+    void loadContent();
 
 private:
     QString mSessionTitle;
@@ -101,9 +76,10 @@ private:
     QString mPageTitle;
     QString mComments;
 
-    QVector<UBTeacherStudentAction*> mActionList;
+    QVector<sAction> mActionList;
-    QVector<UBUrlWidget*> mUrlList;
+    QVector<sLink> mUrlList;
     QVector<QWidget*> mMediaList;
+    QStringList mMediaUrls;
 };
 
 #endif // UBTEACHERBARDATAMGR_H

src/gui/UBTeacherBarPreviewWidget.cpp

@@ -302,13 +302,12 @@ void UBTeacherBarPreviewWidget::setLinks(QStringList links)
     }
 }
 
-void UBTeacherBarPreviewWidget::loadInfos(sTeacherBarInfos *infos)
+void UBTeacherBarPreviewWidget::updateFields()
 {
-    if(NULL != infos){
-        setTitle(infos->title);
-        mediaViewer()->loadMedia(infos->medias);
 
-        // Add the comments
-        //setComments();
 }
+
+void UBTeacherBarPreviewWidget::clearFields()
+{
+
 }

src/gui/UBTeacherBarPreviewWidget.h

@@ -61,7 +61,8 @@ public:
     void setLinks(QStringList links);
     void clean();
     QLabel* mediaLabel() { return mpMediaLabel;}
-    void loadInfos(sTeacherBarInfos* infos);
+    void updateFields();
+    void clearFields();
 
 signals:
     void showEditMode();

src/gui/UBTeacherBarWidget.cpp

@@ -59,6 +59,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
     connect(mpDocPreviewWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState)));
     connect(mpDocEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState)));
     connect(mpPageEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState)));
+    connect(mpPageEditWidget, SIGNAL(valueChanged()), this, SLOT(onValueChanged()));
 }
 
 UBTeacherBarWidget::~UBTeacherBarWidget()
@@ -88,110 +89,49 @@ void UBTeacherBarWidget::onValueChanged()
 
 void UBTeacherBarWidget::saveContent()
 {
-    sTeacherBarInfos infos;
+    mpPageEditWidget->saveFields();
-    mpPageEditWidget->saveInfos(&infos);
+    mData.saveContent();
-    UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos);
 }
 
 void UBTeacherBarWidget::loadContent()
 {
-//    clearWidgetLists();
+    // Clear the old datas
-//    sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex());
+    mpPageEditWidget->clearFields();
-
+    mpPreview->clearFields();
-//    mpPageEditWidget->loadInfos(&nextInfos);
+    mpDocEditWidget->clearFields();
-//    mpPreview->mediaViewer()->cleanMedia();
+    mpDocPreviewWidget->clearFields();
-
+
-//    if(!isEmpty()){
+    // Update the datas
-//        // Update the fields of the preview widget
+    mData.loadContent();
-//        onTBStateChanged(eTeacherBarState_PagePreview);
+
-//        mpPreview->clean();
+    qDebug() << mData.comments();
-//        mpPreview->loadInfos(&nextInfos);
+
-
+    // Update the fields
-//        // Add the actions
+    mpPageEditWidget->updateFields();
-//        if(!mActionList.empty()){
+    mpPreview->updateFields();
-//            QStringList actions;
+    mpDocEditWidget->updateFields();
-//            foreach(UBTeacherStudentAction* action, mActionList){
+    mpDocPreviewWidget->updateFields();
-//                QString desc = QString("%0;%1").arg(action->comboValue()).arg(action->text());
+
-//                actions << desc;
+    if(!isEmpty()){
-//            }
+        onTBStateChanged(eTeacherBarState_PagePreview);
-//            mpPreview->setActions(actions);
+    }else{
-//        }
+        if(1 == UBApplication::boardController->activeDocument()->pageCount()){
-
+           onTBStateChanged(eTeacherBarState_DocumentEdit);
-//        // Add the media
+        }else{
-//        if(nextInfos.medias.count() > 0){
+           onTBStateChanged(eTeacherBarState_PageEdit);
-//            QList<QWidget*> widgetList;
+        }
-//            widgetList.append(mpPreview->mediaLabel());
+    }
-//            mpPreview->mediaViewer()->loadWidgets(widgetList,false);
-//            int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias);
-//            if(loadedMedia)
-//                    mpPreview->mediaLabel()->setVisible(true);
-//        }
-
-
-//        // Add the links
-//        if(!mUrlList.empty()){
-//            QStringList links;
-//            foreach(UBUrlWidget* url, mUrlList){
-//                QStringList list = url->url().split(";");
-//                QString formedlink = "<a href=";
-//                if(!list.at(0).startsWith("http://"))
-//                    formedlink += "http://";
-//                formedlink += list.at(0) + ">" + list.at(1) + "</a>";
-//                links << formedlink;
-//            }
-//            mpPreview->setLinks(links);
-//        }
-//    }
-//    else{
-//        // If the document has only one page, show the document edit page
-//        if(1 == UBApplication::boardController->activeDocument()->pageCount()){
-//            onTBStateChanged(eTeacherBarState_DocumentEdit);
-//        }else{
-//            onTBStateChanged(eTeacherBarState_PageEdit);
-//        }
-//    }
 }
 
 bool UBTeacherBarWidget::isEmpty()
 {
     return  mData.pageTitle() == "" &&
-            mData.urls().empty() &&
+            mData.urls()->empty() &&
-            mData.actions().empty() &&
+            mData.actions()->empty() &&
             mData.medias().empty() &&
-            mData.comments() == "";
+            mData.comments() == "" &&
-}
+            mData.sessionTarget() == "" &&
-
+            mData.sessionTitle() == "";
-void UBTeacherBarWidget::onTitleTextChanged(const QString& text)
-{
-        //mpTitle->setToolTip(text);
-}
-
-void UBTeacherBarWidget::clearWidgetLists()
-{
-//    if(NULL != mpMediaContainer){
-//        for(int i=0; i<mMediaList.size(); i++){
-//            mpMediaContainer->removeWidget(mMediaList.at(i));
-//            delete mMediaList.at(i);
-//        }
-//        mMediaList.clear();
-//        mpMediaContainer->cleanMedias();
-//    }
-
-//    if(NULL != mpActions){
-//        for(int i=0; i<mActionList.size(); i++){
-//            mpActions->removeWidget(mActionList.at(i));
-//            delete mActionList.at(i);
-//        }
-//        mActionList.clear();
-//    }
-
-//    if(NULL != mpLinks){
-//        for(int i=0; i<mUrlList.size(); i++){
-//            mpLinks->removeWidget(mUrlList.at(i));
-//            delete mUrlList.at(i);
-//        }
-//        mUrlList.clear();
-//    }
 }
 
 void UBTeacherBarWidget::onShowEditMode()

src/gui/UBTeacherBarWidget.h

@@ -36,12 +36,10 @@ private slots:
     void saveContent();
     void loadContent();
     void onValueChanged();
-    void onTitleTextChanged(const QString& text);
     void onShowEditMode();
     void onTBStateChanged(eTeacherBarState state);
 
 private:
-    void clearWidgetLists();
     bool isEmpty();
 
     QVBoxLayout mLayout;