Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012

resources/sankore.qrc

@@ -338,5 +338,8 @@
         <file>images/download_close.png</file>
         <file>images/download_open.png</file>
         <file>images/tab_mask.png</file>
+        <file>images/duration1.png</file>
+        <file>images/duration2.png</file>
+        <file>images/duration3.png</file>
     </qresource>
 </RCC>

src/gui/UBTeacherBarWidget.h

@@ -10,7 +10,9 @@ class UBVideoPlayer;
 #include <QLabel>
 #include <QTextEdit>
 #include <QLineEdit>
-#include <QComboBox>
+#include <QCheckBox>
+#include <QTabWidget>
+#include <QButtonGroup>
 
 #include "UBDockPaletteWidget.h"
 
@@ -85,26 +87,20 @@ private:
 
     QVBoxLayout* mpLayout;
     QHBoxLayout* mpTitleLayout;
-    QHBoxLayout* mpPhasisLayout;
     QHBoxLayout* mpDurationLayout;
-    QHBoxLayout* mpEquipmentLayout;
-    QHBoxLayout* mpActivityLayout;
     QLabel* mpTitleLabel;
-    QLabel* mpPhasisLabel;
     QLabel* mpDurationLabel;
-    QLabel* mpEquipmentLabel;
-    QLabel* mpActivityLabel;
     QLineEdit* mpTitle;
-    QLineEdit* mpEquipment;
-    QComboBox* mpPhasis;
-    QComboBox* mpDuration;
-    QComboBox* mpActivity;
     UBTeacherStudentAction* mpAction1;
     UBTeacherStudentAction* mpAction2;
     UBTeacherStudentAction* mpAction3;
     UBTeacherBarDropMediaZone* mpDropMediaZone;
     QWidget* mpContainer;
     QVBoxLayout* mpContainerLayout;
+    QCheckBox* mpDuration1;
+    QCheckBox* mpDuration2;
+    QCheckBox* mpDuration3;
+    QButtonGroup* mpDurationButtons;
 };
 
 #endif // UBTEACHERBARWIDGET_H