Backup

resources/style.qss

@@ -13,6 +13,13 @@ QWidget#UBTBMediaContainer
 	border: 2px solid #999999;
 }
 
+QFrame#UBTBSeparator
+{
+	background: #DDDDDD;
+	border-radius: 2px;
+	border: 1px solid #DDDDDD;
+}
+
 QWidget#UBMediaVideoContainer
 {
 	background: #000000;
@@ -27,11 +34,17 @@ QWidget#UBTeacherBarPreviewWidget
 	border: 2px solid #999999;
 }
 
+QLabel#UBTBPreviewSessionTitle
+{
+	font-size: 12px;
+}
+
 QLabel#UBTeacherBarPreviewTitle
 {
 	color: #555555;
-	font-size : 18px;
+	font-size : 20px;
 	font-weight:bold;
+	padding-left:5px;
 }
 
 QLabel#UBMediaPlayerButton
@@ -44,7 +57,7 @@ QLabel#UBTeacherBarPreviewSubtitle
 	color: #555555;
 	font-size : 15px;
 	font-weight:bold;
-	padding-top: 10px;
+	padding-left:5px;
 }
 
 QWidget#UBLibWebView
@@ -61,7 +74,8 @@ QWidget#UBActionPreviewOwner
 	font-weight: bold;
 }
 
-QWidget#UBTeacherBarPreviewComments
+QWidget#UBTeacherBarPreviewComments,
+QWidget#UBTeacherBarTargetBox
 {
 	border-radius: 10px;
 	border: white 2px solid;

src/customWidgets/UBWidgetList.cpp

@@ -57,7 +57,7 @@ void UBWidgetList::addWidget(QWidget *widget)
 
 void UBWidgetList::removeWidget(QWidget *widget)
 {
-    if(NULL != mpLayout){
+    if(NULL != mpLayout && NULL != widget){
         mpLayout->removeWidget(widget);
         mWidgetInfo.remove(widget);
         widget->setVisible(false);

src/gui/UBTeacherBarPreviewWidget.h

@@ -4,6 +4,7 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QPushButton>
+#include <QFrame>
 
 #include "core/UBPersistenceManager.h"
 #include "customWidgets/UBWidgetList.h"
@@ -30,12 +31,12 @@ class UBActionPreview : public QWidget
 public:
     UBActionPreview(QWidget* parent=0, const char* name="UBActionPreview");
     ~UBActionPreview();
-    void setOwner(const QString& owner);
+    void setOwner(int owner);
     void setContent(const QString& content);
 
 private:
     QLabel* mpOwner;
-    QLabel* mpContent;
+    QTextEdit* mpContent;
 
     QVBoxLayout mLayout;
     QHBoxLayout mOwnerLayout;
@@ -48,19 +49,19 @@ public:
     ~UBTBPreviewContainer();
 };
 
+class UBTBPreviewSeparator : public QFrame
+{
+public:
+    UBTBPreviewSeparator(QWidget* parent=0, const char* name="UBTBPreviewSeparator");
+    ~UBTBPreviewSeparator();
+};
+
 class UBTeacherBarPreviewWidget : public QWidget
 {
     Q_OBJECT
 public:
     UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget");
     ~UBTeacherBarPreviewWidget();
-    UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;}
-    void setTitle(const QString& title);
-    void setComments(const QString& comments);
-    void setActions(QStringList actions);
-    void setLinks(QStringList links);
-    void clean();
-    QLabel* mediaLabel() { return mpMediaLabel;}
     void updateFields();
     void clearFields();
 
@@ -69,29 +70,47 @@ signals:
 
 private slots:
     void onEdit();
+    void onActiveSceneChanged();
 
 private:
-    void hideElements();
+    void generateActions();
+    void generateMedias();
+    void generateLinks();
+    void generateComments();
 
     QVBoxLayout mLayout;
     QHBoxLayout mEditLayout;
-    QHBoxLayout mTitleDurationLayout;
-    UBTeacherBarPreviewMedia mMediaViewer;
-    QList<QWidget*> mWidgets;
-    QList<QWidget*> mStoredWidgets;
-
     QPushButton* mpEditButton;
+
+    // Titles
+    QVBoxLayout mTitleLayout;
+    UBTBPreviewSeparator mTitleSeparator;
+    QWidget mTitleContainer;
+    QLabel* mpSessionTitle;
     QLabel* mpTitle;
-    QLabel* mpDuration;
-    QLabel* mpActionsLabel;
-    QLabel* mpMediaLabel;
-    QLabel* mpCommentsLabel;
-    QLabel* mpComments;
-    QLabel* mpLinksLabel;
-    QLabel* mpTmpLink;
-    UBActionPreview* mpTmpAction;
+    QLabel* mpTitleLabel;
+    QLabel* mpPageNbrLabel;
     UBTBPreviewContainer* mpContentContainer;
+
+    // Schedule
+    QLabel* mpScheduleLabel;
+
+    // License
+    UBTBPreviewSeparator mLicenseSeparator;
+    QLabel* mpLicenseLabel;
+
+    /** Pointer to the datas */
     UBTeacherBarDataMgr* mpDataMgr;
+    /** The list of stored widgets */
+    QList<QWidget*> mStoredWidgets;
+    /** A temporary action widget */
+    UBActionPreview* mpTmpAction;
+    /** A temporary media widget */
+    UBTeacherBarPreviewMedia* mpTmpMedia;
+    /** A temporary link */
+    QLabel* mpTmpLink;
+    /** A temporary comments field */
+    QTextEdit* mpTmpComment;
 };
 
 #endif // UBTEACHERBARPREVIEWWIDGET_H

src/gui/UBTeacherBarWidget.cpp

@@ -39,13 +39,13 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
     // Create the GUI
     setLayout(&mLayout);
 
-    mpPageEditWidget = new UBTBPageEditWidget(&mData, this);
-    mpPreview = new UBTeacherBarPreviewWidget(&mData, this);
-    mpDocPreviewWidget = new UBTBDocumentPreviewWidget(&mData, this);
-    mpDocEditWidget = new UBTBDocumentEditWidget(&mData, this);
-
     mpStackWidget = new QStackedWidget(this);
     mLayout.addWidget(mpStackWidget);
+    mpPageEditWidget = new UBTBPageEditWidget(&mData, mpStackWidget);
+    mpPreview = new UBTeacherBarPreviewWidget(&mData, mpStackWidget);
+    mpDocPreviewWidget = new UBTBDocumentPreviewWidget(&mData, mpStackWidget);
+    mpDocEditWidget = new UBTBDocumentEditWidget(&mData, mpStackWidget);
+
     mpStackWidget->addWidget(mpPageEditWidget);
     mpStackWidget->addWidget(mpPreview);
     mpStackWidget->addWidget(mpDocPreviewWidget);
@@ -120,7 +120,7 @@ void UBTeacherBarWidget::loadContent(bool docChanged)
 
     // Update the fields
     mpPageEditWidget->updateFields();
-    mpPreview->updateFields();
+    //mpPreview->updateFields();
     if(docChanged){
         mpDocEditWidget->updateFields();
         mpDocPreviewWidget->updateFields();
@@ -155,15 +155,19 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state)
 {
     switch(state){
     case eTeacherBarState_DocumentEdit:
+        //mpDocEditWidget->updateFields();
         mpStackWidget->setCurrentWidget(mpDocEditWidget);
         break;
     case eTeacherBarState_DocumentPreview:
+        //mpDocPreviewWidget->updateFields();
         mpStackWidget->setCurrentWidget(mpDocPreviewWidget);
         break;
     case eTeacherBarState_PageEdit:
+        mpPageEditWidget->updateFields();
         mpStackWidget->setCurrentWidget(mpPageEditWidget);
         break;
     case eTeacherBarState_PagePreview:
+        mpPreview->updateFields();
         mpStackWidget->setCurrentWidget(mpPreview);
         break;
     }