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

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit 265d2bfdba
  1. BIN
      resources/images/duration1.png
  2. BIN
      resources/images/duration2.png
  3. BIN
      resources/images/duration3.png
  4. 3
      resources/style.qss
  5. 18
      src/gui/UBTeacherBarWidget.cpp
  6. 5
      src/gui/UBTeacherBarWidget.h

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -4,7 +4,8 @@ QWidget#UBLibPathViewer,
QWidget#UBTeacherStudentAction, QWidget#UBTeacherStudentAction,
QWidget#UBLibNavigatorWidget, QWidget#UBLibNavigatorWidget,
QWidget#UBLibItemProperties, QWidget#UBLibItemProperties,
QWidget#UBDownloadWidget QWidget#UBDownloadWidget,
QWidget#UBWidgetList
{ {
background: #EEEEEE; background: #EEEEEE;
border-radius: 10px; border-radius: 10px;

@ -32,6 +32,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
, mpDuration2(NULL) , mpDuration2(NULL)
, mpDuration3(NULL) , mpDuration3(NULL)
, mpDurationButtons(NULL) , mpDurationButtons(NULL)
, mpActions(NULL)
{ {
setObjectName(name); setObjectName(name);
mName = "TeacherBarWidget"; mName = "TeacherBarWidget";
@ -84,9 +85,9 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
mpLayout->addLayout(mpDurationLayout); mpLayout->addLayout(mpDurationLayout);
// Actions // Actions
mpAction1 = new UBTeacherStudentAction(1, mpContainer); mpActions = new UBWidgetList(this);
mpActions->setEmptyText(tr("Add actions"));
mpLayout->addWidget(mpAction1); mpLayout->addWidget(mpActions);
// Media // Media
mpDropMediaZone = new UBTeacherBarDropMediaZone(); mpDropMediaZone = new UBTeacherBarDropMediaZone();
@ -98,8 +99,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent()));
connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent()));
connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged()));
connect(mpAction1->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction1->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
} }
UBTeacherBarWidget::~UBTeacherBarWidget() UBTeacherBarWidget::~UBTeacherBarWidget()
@ -189,8 +188,6 @@ void UBTeacherBarWidget::saveContent()
{ {
sTeacherBarInfos infos; sTeacherBarInfos infos;
infos.title = mpTitle->text(); infos.title = mpTitle->text();
infos.action1Master = mpAction1->teacherText();
infos.action1Student = mpAction1->studentText();
UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos);
} }
@ -198,8 +195,6 @@ void UBTeacherBarWidget::loadContent()
{ {
sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex());
mpTitle->setText(nextInfos.title); mpTitle->setText(nextInfos.title);
mpAction1->setTeacherText(nextInfos.action1Master);
mpAction1->setStudentText(nextInfos.action1Student);
} }
void UBTeacherBarWidget::onTitleTextChanged(const QString& text) void UBTeacherBarWidget::onTitleTextChanged(const QString& text)
@ -207,11 +202,6 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text)
mpTitle->setToolTip(text); mpTitle->setToolTip(text);
} }
void UBTeacherBarWidget::onEquipmentTextChanged(const QString& text)
{
}
UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent) UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent)
, mpActionLabel(NULL) , mpActionLabel(NULL)
, mpTeacherLabel(NULL) , mpTeacherLabel(NULL)

@ -16,6 +16,7 @@ class UBMediaPlayer;
#include "customWidgets/UBWidgetList.h" #include "customWidgets/UBWidgetList.h"
#include "UBDockPaletteWidget.h" #include "UBDockPaletteWidget.h"
#include "customWidgets/UBWidgetList.h"
#define LABEL_MINWIDHT 80 #define LABEL_MINWIDHT 80
@ -75,8 +76,7 @@ private slots:
void saveContent(); void saveContent();
void loadContent(); void loadContent();
void onValueChanged(); void onValueChanged();
void onTitleTextChanged(const QString& text); void onTitleTextChanged(const QString& text);
void onEquipmentTextChanged(const QString& text);
private: private:
void populateCombos(); void populateCombos();
@ -95,6 +95,7 @@ private:
QCheckBox* mpDuration2; QCheckBox* mpDuration2;
QCheckBox* mpDuration3; QCheckBox* mpDuration3;
QButtonGroup* mpDurationButtons; QButtonGroup* mpDurationButtons;
UBWidgetList* mpActions;
}; };
#endif // UBTEACHERBARWIDGET_H #endif // UBTEACHERBARWIDGET_H

Loading…
Cancel
Save