first new teacher guide implementation

plugins/cffadaptor/src/UBCFFAdaptor.cpp

@@ -639,7 +639,7 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parseSvgPageSection(const QDomElemen
 
 void UBCFFAdaptor::UBToCFFConverter::writeQDomElementToXML(const QDomNode &node)
 {
-    if (!node.isNull())
+    if (!node.isNull()){
         if (node.isText())
         {
             mIWBContentWriter->writeCharacters(node.nodeValue());
@@ -662,6 +662,7 @@ void UBCFFAdaptor::UBToCFFConverter::writeQDomElementToXML(const QDomNode &node)
 
             mIWBContentWriter->writeEndElement();
         }
+    }
 }
 
 bool UBCFFAdaptor::UBToCFFConverter::writeExtendedIwbSection()
@@ -1322,7 +1323,7 @@ QDomNode UBCFFAdaptor::UBToCFFConverter::findNodeByTagName(const QDomNode &node,
             if (!iterNode.firstChildElement().isNull())
             {
                 QDomNode foundNode = findNodeByTagName(iterNode.firstChildElement(), tagName);
-                if (!foundNode.isNull())
+                if (!foundNode.isNull()){
                     if (foundNode.isElement())
                     {
                         if (tagName == foundNode.toElement().tagName())
@@ -1332,6 +1333,7 @@ QDomNode UBCFFAdaptor::UBToCFFConverter::findNodeByTagName(const QDomNode &node,
                         break;
                 }
             }
+        }
         
         if (!iterNode.nextSibling().isNull())
             iterNode = iterNode.nextSibling();

src/board/UBBoardPaletteManager.cpp

@@ -31,6 +31,7 @@
 #include "gui/UBZoomPalette.h"
 #include "gui/UBActionPalette.h"
 #include "gui/UBFavoriteToolPalette.h"
+#include "gui/UBDockTeacherGuideWidget.h"
 
 
 #include "web/UBWebPage.h"
@@ -84,6 +85,7 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
     , mpCachePropWidget(NULL)
     , mpDownloadWidget(NULL)
     , mpDesktopLibWidget(NULL)
+    , mpTeacherGuideWidget(NULL)
     , mDownloadInProgress(false)
 {
     setupPalettes();
@@ -135,6 +137,7 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
     mpCachePropWidget = new UBCachePropertiesWidget();
 
     mpDownloadWidget = new UBDockDownloadWidget();
+    mpTeacherGuideWidget = new UBDockTeacherGuideWidget();
 
     // Add the dock palettes
     mLeftPalette = new UBLeftPalette(mContainer);
@@ -143,6 +146,9 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
     mLeftPalette->registerWidget(mpPageNavigWidget);
     mLeftPalette->addTab(mpPageNavigWidget);
 
+    mLeftPalette->registerWidget(mpTeacherGuideWidget);
+    mLeftPalette->addTab(mpTeacherGuideWidget);
+
     mLeftPalette->connectSignals();
 
     mRightPalette = new UBRightPalette(mContainer);
@@ -232,6 +238,7 @@ void UBBoardPaletteManager::setupPalettes()
 #endif
     }
 
+
     setupDockPaletteWidgets();
 
 

src/board/UBBoardPaletteManager.h

@@ -40,6 +40,7 @@ class UBServerXMLHttpRequest;
 class UBKeyboardPalette;
 class UBMainWindow;
 class UBApplicationController;
+class UBDockTeacherGuideWidget;
 
 class UBBoardPaletteManager : public QObject
 {
@@ -52,6 +53,7 @@ class UBBoardPaletteManager : public QObject
         void setupLayout();
         UBLeftPalette* leftPalette(){return mLeftPalette;}
         UBRightPalette* rightPalette(){return mRightPalette;}
+        UBStylusPalette* stylusPalette(){return mStylusPalette;}
         void showVirtualKeyboard(bool show = true);
         void initPalettesPosAtStartup();
         void connectToDocumentController();
@@ -134,6 +136,8 @@ class UBBoardPaletteManager : public QObject
         //       lib widget!
         UBLibWidget* mpDesktopLibWidget;
 
+        UBDockTeacherGuideWidget* mpTeacherGuideWidget;
+
         bool mDownloadInProgress;
 
     private slots:

src/board/UBBoardView.cpp

@@ -49,9 +49,6 @@
 
 #include "document/UBDocumentProxy.h"
 
-#include "customWidgets/UBDraggableLabel.h"
-#include "customWidgets/UBDraggableMedia.h"
-
 #include "tools/UBGraphicsCompass.h"
 #include "tools/UBGraphicsCache.h"
 
@@ -378,8 +375,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
 
 }
 
-void
-UBBoardView::mousePressEvent (QMouseEvent *event)
+void UBBoardView::mousePressEvent (QMouseEvent *event)
 {
     if (isAbsurdPoint (event->pos ()))
     {
@@ -389,8 +385,11 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
 
     mMouseDownPos = event->pos ();
 
+    emit clickOnBoard();
+
     if (event->button () == Qt::LeftButton && isInteractive ())
     {
+
         UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
 
         if (!mTabletStylusIsPressed)
@@ -809,8 +808,7 @@ void UBBoardView::dropEvent (QDropEvent *event)
         event->acceptProposedAction();
 
     } else if (!event->source() || dynamic_cast<UBThumbnailWidget *>(event->source())
-               || dynamic_cast<QWebView*>(event->source()) || dynamic_cast<UBDraggableMediaPlayer *>(event->source())
-               || dynamic_cast<UBDraggableLabel *>(event->source()) || dynamic_cast<UBDraggableMedia *>(event->source())) {
+               || dynamic_cast<QWebView*>(event->source())) {
 
         mController->processMimeData (event->mimeData (), mapToScene (event->pos ()));
         event->acceptProposedAction();

src/board/UBBoardView.h

@@ -46,6 +46,7 @@ class UBBoardView : public QGraphicsView
         void resized(QResizeEvent* event);
         void hidden();
         void shown();
+        void clickOnBoard();
 
     protected:
 

src/customWidgets/UBActionableWidget.cpp

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <QPainter>
 #include <QDebug>
 

src/customWidgets/UBActionableWidget.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef UBACTIONABLEWIDGET_H
 #define UBACTIONABLEWIDGET_H
 

src/customWidgets/UBDraggableLabel.cpp

-#include <QMimeData>
-#include <QDrag>
-#include <QUrl>
-
-#include "UBDraggableLabel.h"
-
-
-UBDraggableLabel::UBDraggableLabel(QWidget *parent) :
-    QLabel(parent)
-{
-}
-
-UBDraggableLabel::~UBDraggableLabel()
-{
-    //NOOP
-}
-
-void UBDraggableLabel::loadImage(QString imagePath)
-{
-    mSourcePath = imagePath;
-    QPixmap pix = QPixmap(mSourcePath);
-    setPixmap(pix);
-    setScaledContents(true);
-}
-
-void UBDraggableLabel::mousePressEvent(QMouseEvent *event)
-{
-    Q_UNUSED(event);
-    QMimeData *mimeData = new QMimeData;
-    QList<QUrl> urls;
-    urls << QUrl::fromLocalFile(mSourcePath);
-    mimeData->setUrls(urls);
-    mimeData->setText(mSourcePath);
-
-
-    QDrag *drag = new QDrag(this);
-    drag->setMimeData(mimeData);
-    drag->start();
-}

src/customWidgets/UBDraggableLabel.h

-#ifndef UBDRAGGABLELABEL_H
-#define UBDRAGGABLELABEL_H
-
-#include <QLabel>
-
-class UBDraggableLabel : public QLabel
-{
-    Q_OBJECT
-public:
-    UBDraggableLabel(QWidget *parent = 0);
-    ~UBDraggableLabel();
-    void loadImage(QString imagePath);
-signals:
-
-public slots:
-
-protected:
-    QString mSourcePath;
-    void mousePressEvent(QMouseEvent *event);
-
-};
-
-#endif // UBDRAGGABLELABEL_H

src/customWidgets/UBDraggableMedia.cpp

-#include <QApplication>
-#include <QUrl>
-
-#include "UBDraggableMedia.h"
-
-UBDraggableMedia::UBDraggableMedia(eMediaType type, QWidget *parent, const char *name):UBMediaWidget(type, parent, name)
-{
-    removeAllActions();
-}
-
-UBDraggableMedia::~UBDraggableMedia()
-{
-
-}
-
-void UBDraggableMedia::mousePressEvent(QMouseEvent* ev)
-{
-    if(Qt::LeftButton == ev->button()){
-        mDragStartPos = ev->pos();
-    }
-}
-
-void UBDraggableMedia::mouseMoveEvent(QMouseEvent* ev)
-{
-    if(!(ev->buttons() & Qt::LeftButton)){
-        return;
-    }
-    if((ev->pos() - mDragStartPos).manhattanLength() < QApplication::startDragDistance()){
-        return;
-    }
-    QDrag *drag = new QDrag(this);
-    QMimeData *mimeData = new QMimeData;
-
-    QList<QUrl> urls;
-    urls << QUrl(mFilePath);
-    mimeData->setText(mFilePath);
-    mimeData->setUrls(urls);
-
-    drag->setMimeData(mimeData);
-
-    drag->exec(Qt::CopyAction | Qt::MoveAction);
-}

src/customWidgets/UBDraggableMedia.h

-#ifndef UBDRAGGABLEMEDIA_H
-#define UBDRAGGABLEMEDIA_H
-
-#include "UBMediaWidget.h"
-
-class UBDraggableMedia : public UBMediaWidget
-{
-public:
-    UBDraggableMedia(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBDraggableMedia");
-    ~UBDraggableMedia();
-protected:
-    void mousePressEvent(QMouseEvent* ev);
-    void mouseMoveEvent(QMouseEvent* ev);
-
-private:
-    QPoint mDragStartPos;
-};
-
-#endif // UBDRAGGABLEMEDIA_H

src/customWidgets/customWidgets.pri

 
 HEADERS      += src/customWidgets/UBWidgetList.h \
-    src/customWidgets/UBDraggableLabel.h \
     src/customWidgets/UBMediaWidget.h \
-    src/globals/UBGlobals.h \
-    src/customWidgets/UBDraggableMedia.h \
     src/customWidgets/UBActionableWidget.h
 
 SOURCES      += src/customWidgets/UBWidgetList.cpp \
-    src/customWidgets/UBDraggableLabel.cpp \
     src/customWidgets/UBMediaWidget.cpp \
-    src/customWidgets/UBDraggableMedia.cpp \
     src/customWidgets/UBActionableWidget.cpp

src/desktop/UBDesktopAnnotationController.cpp

@@ -761,21 +761,6 @@ void UBDesktopAnnotationController::togglePropertyPalette(UBActionPalette *palet
 
 void UBDesktopAnnotationController::switchCursor(const int tool)
 {
-//     enum Enum
-//     {
-//         Pen = 0, 
-//         Eraser, 
-//         Marker, 
-//         Selector, 
-//         Hand, 
-//         ZoomIn, 
-//         ZoomOut, 
-//         Pointer, 
-//         Line, 
-//         Text, 
-//         Capture
-//     };
-
     mTransparentDrawingScene->setToolCursor(tool);
     mTransparentDrawingView->setToolCursor(tool);
 }
@@ -825,17 +810,6 @@ void UBDesktopAnnotationController::onDesktopPaletteMaximized()
         connect(pPointerButton, SIGNAL(pressed()), this, SLOT(pointerActionPressed()));
         connect(pPointerButton, SIGNAL(released()), this, SLOT(pointerActionReleased()));
     }
-
-    //     enum Enum
-    //     {
-    //         Hand, 
-    //         ZoomIn, 
-    //         ZoomOut, 
-    //         Line, 
-    //         Text, 
-    //         Capture
-    //     };
-
 }
 
 /**
@@ -871,16 +845,6 @@ void UBDesktopAnnotationController::onDesktopPaletteMinimize()
 
 void UBDesktopAnnotationController::TransparentWidgetResized()
 {
-/*
-    int rW = UBApplication::boardController->paletteManager()->rightPalette()->width();
-    int rH_ = UBApplication::boardController->paletteManager()->rightPalette()->height();
-    int rH = mTransparentDrawingView->height();
-
-    UBApplication::boardController->paletteManager()->rightPalette()->resize(rW+1, rH);
-
-  //  UBApplication::boardController->paletteManager()->rightPalette()->resize(500, 500);
-*/
-
     onTransparentWidgetResized();
 }
 
@@ -899,8 +863,6 @@ void UBDesktopAnnotationController::onTransparentWidgetResized()
 
     UBApplication::boardController->paletteManager()->leftPalette()->resize(lW+1, rH);
     UBApplication::boardController->paletteManager()->leftPalette()->resize(lW, rH);
-
-//      mRightPalette->resize(mRightPalette->width(), mTransparentDrawingView->height());
 }
 
 void UBDesktopAnnotationController::updateMask(bool bTransparent)

src/domain/UBGraphicsItemDelegate.cpp

@@ -322,16 +322,8 @@ void UBGraphicsItemDelegate::duplicate()
 }
 void UBGraphicsItemDelegate::increaseZLevel(int delta)
 {
+    Q_UNUSED(delta)
     qDebug() << delegated()->scene()->items().count();
-
-//    UBGraphicsItem::assignZValue(delegated(), )
-
-//    int valueCandidate = delegated()->data(UBGraphicsItemData::ItemOwnZValue).toInt();
-//    if (delta < 0) {
-
-//    } else if (delta > 0) {
-
-//    }
 }
 
 void UBGraphicsItemDelegate::lock(bool locked)

src/gui/UBActionPalette.cpp

@@ -231,6 +231,7 @@ void UBActionPalette::mouseReleaseEvent(QMouseEvent * event)
 
 void UBActionPalette::actionChanged()
 {
+    emit itemOnActionPaletteChanged();
     for(int i = 0; i < mActions.length() && i < mButtons.length(); i++)
     {
         mButtons.at(i)->setVisible(mActions.at(i)->isVisible());

src/gui/UBActionPalette.h

@@ -56,10 +56,12 @@ class UBActionPalette : public UBFloatingPalette
     public slots:
         void close();
 
+
     signals:
         void closed();
         void buttonGroupClicked(int id);
         void customMouseReleased();
+        void itemOnActionPaletteChanged();
 
     protected:
         virtual void paintEvent(QPaintEvent *event);

src/gui/UBDockTeacherGuideWidget.cpp

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "core/UBApplication.h"
+#include "globals/UBGlobals.h"
+
+#include "UBDockTeacherGuideWidget.h"
+#include "UBTeacherGuideWidget.h"
+
+
+UBDockTeacherGuideWidget::UBDockTeacherGuideWidget(QWidget* parent, const char* name):
+    UBDockPaletteWidget(parent,name)
+  , mpTeacherGuideWidget(NULL)
+{
+    mName = "TeacherGuide";
+
+    setAttribute(Qt::WA_StyledBackground, true);
+    setStyleSheet(UBApplication::globalStyleSheet());
+
+    mIconToLeft = QPixmap(":images/teacher_open.png");
+    mIconToRight = QPixmap(":images/teacher_close.png");
+
+    mpLayout = new QVBoxLayout(this);
+    setLayout(mpLayout);
+    mpTeacherGuideWidget = new UBTeacherGuideWidget(this);
+    mpLayout->addWidget(mpTeacherGuideWidget);
+}
+
+UBDockTeacherGuideWidget::~UBDockTeacherGuideWidget()
+{
+    DELETEPTR(mpTeacherGuideWidget);
+    DELETEPTR(mpLayout);
+}

src/gui/UBDockTeacherGuideWidget.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBDOCKTEACHERGUIDEWIDGET_H
+#define UBDOCKTEACHERGUIDEWIDGET_H
+
+class QVBoxLayout;
+class UBTeacherGuideWidget;
+
+#include "UBDockPaletteWidget.h"
+
+
+class UBDockTeacherGuideWidget : public UBDockPaletteWidget
+{
+    Q_OBJECT
+public:
+    UBDockTeacherGuideWidget(QWidget* parent=0, const char* name="UBDockTeacherGuideWidget");
+    ~UBDockTeacherGuideWidget();
+
+    bool visibleInMode(eUBDockPaletteWidgetMode mode){ return mode == eUBDockPaletteWidget_BOARD; }
+
+private:
+    QVBoxLayout* mpLayout;
+    UBTeacherGuideWidget* mpTeacherGuideWidget;
+};
+
+#endif // UBDOCKTEACHERGUIDEWIDGET_H

src/gui/UBMediaPlayer.cpp

-#include "UBMediaPlayer.h"
-
-
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include <QtGui>
 
+#include "UBMediaPlayer.h"
+
 #define SLIDER_RANGE 8
 
 
 MediaVideoWidget::MediaVideoWidget(UBMediaPlayer *player, QWidget *parent) :
     Phonon::VideoWidget(parent), m_player(player)/*, m_action(this)*/
 {
-//    m_action.setCheckable(true);
-//    m_action.setChecked(false);
-//    m_action.setShortcut(QKeySequence( Qt::AltModifier + Qt::Key_Return));
-//    m_action.setShortcutContext(Qt::WindowShortcut);
-//    connect(&m_action, SIGNAL(toggled(bool)), SLOT(setFullScreen(bool)));
-//    addAction(&m_action);
-//    setAcceptDrops(true);
+    //NOOP
 }
 
 void MediaVideoWidget::timerEvent(QTimerEvent *e)
@@ -41,23 +48,6 @@ UBMediaPlayer::UBMediaPlayer() :
 
     QSize buttonSize(26, 20);
 
-//    QPushButton *openButton = new QPushButton(this);
-
-////    openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
-////    QPalette bpal;
-////    QColor arrowcolor = bpal.buttonText().color();
-////    if (arrowcolor == Qt::black)
-////        arrowcolor = QColor(80, 80, 80);
-////    bpal.setBrush(QPalette::ButtonText, arrowcolor);
-////    openButton->setPalette(bpal);
-
-//    rewindButton = new QPushButton(this);
-//    rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
-
-//    forwardButton = new QPushButton(this);
-//    forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
-//    forwardButton->setEnabled(false);
-
     playButton = new QPushButton(this);
     playIcon = style()->standardIcon(QStyle::SP_MediaPlay);
     pauseIcon = style()->standardIcon(QStyle::SP_MediaPause);
@@ -69,53 +59,18 @@ UBMediaPlayer::UBMediaPlayer() :
     QVBoxLayout *vLayout = new QVBoxLayout(this);
     vLayout->setContentsMargins(1, 1, 1, 1);
 
-//    QHBoxLayout *layout = new QHBoxLayout();
-
-//    info = new QLabel(this);
-//    info->setMinimumHeight(70);
-//    info->setAcceptDrops(false);
-//    info->setMargin(2);
-//    info->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-//    info->setLineWidth(2);
-//    info->setAutoFillBackground(true);
-
-//    QPalette palette;
-//    palette.setBrush(QPalette::WindowText, Qt::white);
-#ifndef Q_WS_MAC
-//    rewindButton->setMinimumSize(buttonSize);
-//    forwardButton->setMinimumSize(buttonSize);
-    playButton->setMinimumSize(buttonSize);
-#endif
-//    info->setStyleSheet("border-image:url(:/images/screen.png) ; border-width:3px");
-//    info->setPalette(palette);
-//    info->setText(tr("<center>No media</center>"));
-
-
-//    layout->addWidget(rewindButton);
-//    layout->addWidget(playButton);
-//    layout->addWidget(forwardButton);
 
-//    layout->addStretch();
-
-//    vLayout->addWidget(info);
     initVideoWindow();
     vLayout->addWidget(&m_videoWindow);
-//    m_videoWidget->setStyleSheet(QString("background:red;"));
     QVBoxLayout *buttonPanelLayout = new QVBoxLayout();
 #ifndef Q_WS_WIN
         m_videoWindow.hide();
 #endif
-//    buttonPanelLayout->addLayout(layout);
-
-//    timeLabel = new QLabel(this);
     progressLabel = new QLabel(this);
     QWidget *sliderPanel = new QWidget(this);
-//    sliderPanel->setStyleSheet(QString("background:green;"));
     QHBoxLayout *sliderLayout = new QHBoxLayout();
-//    playButton->setStyleSheet(QString("background:yellow;"));
     sliderLayout->addWidget(playButton);
     sliderLayout->addWidget(slider);
-//    sliderLayout->addWidget(timeLabel);
     sliderLayout->addWidget(progressLabel);
     sliderLayout->setContentsMargins(0, 0, 0, 0);
     sliderPanel->setLayout(sliderLayout);
@@ -123,11 +78,7 @@ UBMediaPlayer::UBMediaPlayer() :
     buttonPanelLayout->addWidget(sliderPanel);
     buttonPanelLayout->setContentsMargins(0, 0, 0, 0);
 #ifdef Q_OS_MAC
-//    layout->setSpacing(4);
     buttonPanelLayout->setSpacing(0);
-//    info->setMinimumHeight(100);
-//    info->setFont(QFont("verdana", 15));
-//    openButton->setFocusPolicy(Qt::NoFocus);
 #endif
     QWidget *buttonPanelWidget = new QWidget(this);
     buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
@@ -138,23 +89,13 @@ UBMediaPlayer::UBMediaPlayer() :
     vLayout->addLayout(labelLayout);
     setLayout(vLayout);
 
-
-    // Setup signal connections:
-//    connect(rewindButton, SIGNAL(clicked()), this, SLOT(rewind()));
-
     connect(playButton, SIGNAL(clicked()), this, SLOT(playPause()));
-//    connect(forwardButton, SIGNAL(clicked()), this, SLOT(forward()));
-
-//    connect(&m_MediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(updateTime()));
-//    connect(&m_MediaObject, SIGNAL(tick(qint64)), this, SLOT(updateTime()));
     connect(&m_MediaObject, SIGNAL(finished()), this, SLOT(finished()));
     connect(&m_MediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State,Phonon::State)));
     connect(&m_MediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int)));
     connect(&m_MediaObject, SIGNAL(hasVideoChanged(bool)), this, SLOT(hasVideoChanged(bool)));
 
-//    rewindButton->setEnabled(false);
     playButton->setEnabled(false);
-//    setAcceptDrops(true);
 
     m_audioOutputPath = Phonon::createPath(&m_MediaObject, &m_AudioOutput);
     Phonon::createPath(&m_MediaObject, m_videoWidget);
@@ -180,7 +121,6 @@ void UBMediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
     case Phonon::ErrorState:
         if (m_MediaObject.errorType() == Phonon::FatalError) {
             playButton->setEnabled(false);
-//            rewindButton->setEnabled(false);
         } else {
             m_MediaObject.pause();
         }
@@ -188,16 +128,13 @@ void UBMediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
         break;
 
     case Phonon::StoppedState:
-//        m_videoWidget-> (false);
         // Fall through
     case Phonon::PausedState:
         playButton->setIcon(playIcon);
         if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
             playButton->setEnabled(true);
-//            rewindButton->setEnabled(true);
         } else {
             playButton->setEnabled(false);
-//            rewindButton->setEnabled(false);
         }
         break;
     case Phonon::PlayingState:
@@ -207,10 +144,8 @@ void UBMediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
             m_videoWindow.show();
         // Fall through
     case Phonon::BufferingState:
-//        rewindButton->setEnabled(true);
         break;
     case Phonon::LoadingState:
-//        rewindButton->setEnabled(false);
         break;
     }
 
@@ -280,35 +215,6 @@ void UBMediaPlayer::bufferStatus(int percent)
     }
 }
 
-//void UBMediaPlayer::updateTime()
-//{
-//    long len = m_MediaObject.totalTime();
-//    long pos = m_MediaObject.currentTime();
-//    QString timeString;
-//    if (pos || len)
-//    {
-//        int sec = pos/1000;
-//        int min = sec/60;
-//        int hour = min/60;
-//        int msec = pos;
-
-//        QTime playTime(hour%60, min%60, sec%60, msec%1000);
-//        sec = len / 1000;
-//        min = sec / 60;
-//        hour = min / 60;
-//        msec = len;
-
-//        QTime stopTime(hour%60, min%60, sec%60, msec%1000);
-//        QString timeFormat = "m:ss";
-//        if (hour > 0)
-//            timeFormat = "h:mm:ss";
-//        timeString = playTime.toString(timeFormat);
-//        if (len)
-//            timeString += " / " + stopTime.toString(timeFormat);
-//    }
-//    timeLabel->setText(timeString);
-//}
-
 void UBMediaPlayer::rewind()
 {
     m_MediaObject.seek(0);
@@ -319,7 +225,6 @@ void UBMediaPlayer::forward()
     QList<Phonon::MediaSource> queue = m_MediaObject.queue();
     if (queue.size() > 0) {
         m_MediaObject.setCurrentSource(queue[0]);
-//        forwardButton->setEnabled(queue.size() > 1);
         m_MediaObject.play();
     }
 }
@@ -343,47 +248,10 @@ void UBMediaPlayer::finished()
 
 void UBMediaPlayer::hasVideoChanged(bool bHasVideo)
 {
-//    info->setVisible(!bHasVideo);
     m_videoWindow.setVisible(bHasVideo);
 }
 
 void UBMediaPlayer::resizeEvent(QResizeEvent* pEvent)
 {
     Q_UNUSED(pEvent);
-//    int origWidth = m_videoWindow.width();
-//    int origHeight = m_videoWindow.height();
-
-//    float scaleFactor = (float)origWidth / (float)width();
-//    int newWidth = width();
-//    int newHeigth = origHeight/scaleFactor;
-
-//    m_videoWindow.resize(newWidth, newHeigth);
-}
-
-//*************************************************************************
-UBDraggableMediaPlayer::UBDraggableMediaPlayer():UBMediaPlayer()
-{
-//    setAcceptDrops(true);
-}
-
-void UBDraggableMediaPlayer::setFile(const QString &text)
-{
-    mSourcePath = text;
-    UBMediaPlayer::setFile(text);
-}
-
-void UBDraggableMediaPlayer::mousePressEvent(QMouseEvent *event)
-{
-    Q_UNUSED(event);
-    QMimeData *mimeData = new QMimeData;
-    QList<QUrl> urls;
-    urls << QUrl::fromLocalFile(mSourcePath);
-    mimeData->setUrls(urls);
-    mimeData->setText(mSourcePath);
-
-
-    QDrag *drag = new QDrag(this);
-    drag->setMimeData(mimeData);
-    drag->start();
 }
-

src/gui/UBMediaPlayer.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef UBUBMediaPlayer_H
 #define UBUBMediaPlayer_H
 
@@ -41,7 +56,6 @@ protected:
 private:
     UBMediaPlayer* m_player;
     QBasicTimer m_timer;
-//    QAction m_action;
 };
 
 class UBMediaPlayer : public QWidget
@@ -58,7 +72,6 @@ public slots:
     void openFile();
     void rewind();
     void forward();
-//    void updateTime();
     void finished();
     void playPause();
 
@@ -78,12 +91,8 @@ private:
     QIcon playIcon;
     QIcon pauseIcon;
     QPushButton *playButton;
-//    QPushButton *rewindButton;
-//    QPushButton *forwardButton;
     Phonon::SeekSlider *slider;
-//    QLabel *timeLabel;
     QLabel *progressLabel;
-//    QLabel *info;
 
     QWidget m_videoWindow;
     Phonon::MediaObject m_MediaObject;
@@ -92,16 +101,6 @@ private:
     Phonon::Path m_audioOutputPath;
 };
 
-class UBDraggableMediaPlayer : public UBMediaPlayer
-{
-    Q_OBJECT
-public:
-    UBDraggableMediaPlayer();
-    void setFile(const QString &text);
-protected:
-    QString mSourcePath;
-    void mousePressEvent(QMouseEvent *event);
-};
 
 
 #endif // UBUBMediaPlayer_H

src/gui/UBTeacherGuideDelegate.cpp

+#include "UBTeacherGuideDelegate.h"
+
+UBTeacherGuideDelegate::UBTeacherGuideDelegate()
+{
+}

src/gui/UBTeacherGuideDelegate.h

+#ifndef UBTEACHERGUIDEDELEGATE_H
+#define UBTEACHERGUIDEDELEGATE_H
+
+class UBTeacherGuideDelegate
+{
+public:
+    UBTeacherGuideDelegate();
+};
+
+#endif // UBTEACHERGUIDEDELEGATE_H

src/gui/UBTeacherGuideWidget.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBTEACHERGUIDEWIDGET_H
+#define UBTEACHERGUIDEWIDGET_H
+
+class QTreeWidget;
+class QHeaderView;
+class QLabel;
+class QVBoxLayout;
+class QPushButton;
+
+#include "UBTeacherGuideWidgetsTools.h"
+
+
+/***************************************************************************
+ *               class    UBTeacherGuideEditionWidget                      *
+ ***************************************************************************/
+class UBTeacherGuideEditionWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit UBTeacherGuideEditionWidget(QWidget* parent = 0, const char* name="UBTeacherGuideEditionWidget");
+    ~UBTeacherGuideEditionWidget();
+    void cleanData();
+    QVector<tUBGEElementNode*> getData();
+
+public slots:
+    void onAddItemClicked(QTreeWidgetItem* widget, int column);
+
+private:
+    QList<QTreeWidgetItem*> getChildrenList(QTreeWidgetItem* widgetItem);
+    QVector<tUBGEElementNode*> getPageAndCommentData();
+
+    QVBoxLayout* mpLayout;
+    QLabel* mpDocumentTitle;
+    UBTGAdaptableText* mpPageTitle;
+    UBTGAdaptableText* mpComment;
+    QTreeWidget* mpTreeWidget;
+    QTreeWidgetItem* mpRootWidgetItem;
+    UBAddItem* mpAddAnActionItem;
+    UBAddItem* mpAddAMediaItem;
+    UBAddItem* mpAddALinkItem;
+
+};
+
+
+/***************************************************************************
+ *           class    UBTeacherGuidePresentationWidget                     *
+ ***************************************************************************/
+class UBTeacherGuidePresentationWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit UBTeacherGuidePresentationWidget(QWidget* parent, const char* name = "UBTeacherGuidePresentationName");
+    ~UBTeacherGuidePresentationWidget();
+    void showData(QVector<tUBGEElementNode*>data);
+
+public slots:
+    void onAddItemClicked(QTreeWidgetItem* widget, int column);
+
+private:
+    void createMediaButtonItem();
+
+    UBTGAdaptableText* mpPageTitle;
+    UBTGAdaptableText* mpComment;
+    QVBoxLayout* mpLayout;
+    QHBoxLayout* mpButtonTitleLayout;
+    QLabel* mpDocumentTile;
+    QPushButton* mpModePushButton;
+    QTreeWidget* mpTreeWidget;
+    QTreeWidgetItem* mpRootWidgetItem;
+    QTreeWidgetItem* mpMediaSwitchItem;
+
+};
+
+
+
+/***************************************************************************
+ *                    class    UBTeacherGuideWidget                        *
+ ***************************************************************************/
+
+class UBTeacherGuideWidget : public QStackedWidget
+{
+    Q_OBJECT
+public:
+    explicit UBTeacherGuideWidget(QWidget* parent = 0, const char* name="UBTeacherGuideWidget");
+    ~UBTeacherGuideWidget();
+
+public slots:
+    void changeMode();
+    void showPresentationMode();
+    void connectToStylusPalette();
+
+private:
+    UBTeacherGuideEditionWidget* mpEditionWidget;
+    UBTeacherGuidePresentationWidget* mpPresentationWidget;
+    QVector<tUBGEElementNode*>currentData;
+
+};
+
+#endif // UBTEACHERGUIDEWIDGET_H

src/gui/UBTeacherGuideWidgetsTools.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBTEACHERGUIDEWIDGETSTOOLS_H
+#define UBTEACHERGUIDEWIDGETSTOOLS_H
+
+#include <QObject>
+#include <QTreeWidgetItem>
+#include <QTextEdit>
+#include <QLabel>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QLineEdit>
+#include <QMimeData>
+#include <QStackedWidget>
+#include <QWebView>
+
+#include "customWidgets/UBMediaWidget.h"
+
+class QTreeWidget;
+class QVBoxLayout;
+class QComboBox;
+class QTextEdit;
+class QWidget;
+class UBTGAdaptableText;
+class QDomElement;
+
+typedef struct
+{
+    QString type;
+    QMap<QString,QString> attributes;
+}tUBGEElementNode;
+
+
+class iUBTGSavableData
+{
+public:
+    virtual tUBGEElementNode* saveData() = 0;
+};
+
+
+class UBAddItem : public QTreeWidgetItem
+{
+public:
+    explicit UBAddItem(const QString &strings, int addSubItemWidgetType, QTreeWidget* parent = 0);
+    ~UBAddItem();
+
+signals:
+
+public slots:
+};
+
+class UBTGActionWidget : public QWidget, public iUBTGSavableData
+{
+    Q_OBJECT
+public:
+    explicit UBTGActionWidget(QTreeWidgetItem* widget, QWidget* parent = 0,const char* name = "UBActionWidget");
+    ~UBTGActionWidget();
+    void update();
+    tUBGEElementNode* saveData();
+public slots:
+    void onOwnerChange(int ownerId);
+private:
+    QVBoxLayout* mpLayout;
+    QComboBox* mpOwner;
+    UBTGAdaptableText* mpTask;
+protected:
+    QTreeWidgetItem* mpTreeWidgetItem;
+};
+
+
+class UBTGAdaptableText : public QTextEdit
+{
+    Q_OBJECT
+public:
+    explicit UBTGAdaptableText(QTreeWidgetItem* widget = 0, QWidget *parent = 0, const char* name = "UBTGAdaptableText");
+    void showText(const QString & text);
+    void bottomMargin(int newValue);
+signals:
+
+public slots:
+    void onTextChanged();
+private:
+    int mBottomMargin;
+    QTreeWidgetItem* mpTreeWidgetItem;
+};
+
+
+class UBTGMediaWidget : public QStackedWidget , public iUBTGSavableData
+{
+    Q_OBJECT
+public:
+    UBTGMediaWidget(QTreeWidgetItem* widget = 0, QWidget* parent = 0, const char* name = "UBTGMediaWidget");
+    UBTGMediaWidget(QString relativePath, QTreeWidgetItem* widget = 0, QWidget* parent = 0, const char* name = "UBTGMediaWidget");
+    ~UBTGMediaWidget();
+    tUBGEElementNode* saveData();
+protected:
+    void dragEnterEvent(QDragEnterEvent* event);
+    void dropEvent(QDropEvent* event);
+    void mousePressEvent(QMouseEvent* event);
+private:
+    void parseMimeData(const QMimeData* pMimeData);
+    void createWorkWidget(QString& path);
+    void updateSize();
+
+    QTreeWidgetItem* mpTreeWidgetItem;
+    QLabel* mpDropMeWidget;
+    QWidget* mpWorkWidget;
+    QVBoxLayout* mpLayout;
+    UBTGAdaptableText* mpTitle;
+    QLabel* mpMediaLabelWidget;
+    UBMediaWidget* mpMediaWidget;
+    QWebView* mpWebView;
+    QString mRelativePath;
+    bool mIsPresentationMode;
+};
+
+class UBTGUrlWidget : public QWidget , public iUBTGSavableData
+{
+    Q_OBJECT
+public:
+    UBTGUrlWidget(QWidget* parent = 0, const char* name = "UBTGUrlWidget");
+    ~UBTGUrlWidget();
+    tUBGEElementNode* saveData();
+private:
+    QVBoxLayout* mpLayout;
+    QLineEdit* mpTitle;
+    QLineEdit* mpUrl;
+};
+
+
+#endif // UBTEACHERGUIDEWIDGETSTOOLS_H

src/gui/gui.pri

@@ -46,7 +46,11 @@ HEADERS      += src/gui/UBThumbnailView.h \
                 src/gui/UBLibWebView.h \
                 src/gui/UBDownloadWidget.h \
                 src/gui/UBDockDownloadWidget.h \
-                src/gui/UBMediaPlayer.h
+                src/gui/UBMediaPlayer.h \
+    src/gui/UBDockTeacherGuideWidget.h \
+    src/gui/UBTeacherGuideWidget.h \
+    src/gui/UBTeacherGuideWidgetsTools.h \
+    src/gui/UBTeacherGuideDelegate.h
                 
 SOURCES      += src/gui/UBThumbnailView.cpp \
                 src/gui/UBFloatingPalette.cpp \
@@ -95,7 +99,11 @@ SOURCES      += src/gui/UBThumbnailView.cpp \
                 src/gui/UBLibWebView.cpp \
                 src/gui/UBDownloadWidget.cpp \
                 src/gui/UBDockDownloadWidget.cpp \
-                src/gui/UBMediaPlayer.cpp
+                src/gui/UBMediaPlayer.cpp \
+    src/gui/UBDockTeacherGuideWidget.cpp \
+    src/gui/UBTeacherGuideWidget.cpp \
+    src/gui/UBTeacherGuideWidgetsTools.cpp \
+    src/gui/UBTeacherGuideDelegate.cpp
 
 win32 {
 
@@ -123,15 +131,3 @@ linux-g++-64 {
 
     SOURCES  += src/gui/UBKeyboardPalette_linux.cpp
 }
-
-
-
-
-
-
-
-
-
-
-
-