Finished the teacher bar

preferencesAboutTextFull
shibakaneki 13 years ago
parent f01bc84042
commit 18d24f9d37
  1. BIN
      resources/images/teacher_close.png
  2. BIN
      resources/images/teacher_close_disabled.png
  3. BIN
      resources/images/teacher_open.png
  4. BIN
      resources/images/teacher_open_disabled.png
  5. 2
      resources/sankore.qrc
  6. 6
      src/board/UBBoardPaletteManager.cpp
  7. 1
      src/board/UBBoardPaletteManager.h
  8. 55
      src/gui/UBTeacherBarWidget.cpp
  9. 3
      src/gui/UBTeacherBarWidget.h

Binary file not shown.

Before

Width:  |  Height:  |  Size: 855 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 842 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -332,5 +332,7 @@
<file>images/moveUpDisabled.svg</file> <file>images/moveUpDisabled.svg</file>
<file>images/teacher_close.png</file> <file>images/teacher_close.png</file>
<file>images/teacher_open.png</file> <file>images/teacher_open.png</file>
<file>images/teacher_close_disabled.png</file>
<file>images/teacher_open_disabled.png</file>
</qresource> </qresource>
</RCC> </RCC>

@ -734,3 +734,9 @@ void UBBoardPaletteManager::connectToDocumentController()
{ {
emit connectToDocController(); emit connectToDocController();
} }
void UBBoardPaletteManager::refreshPalettes()
{
mRightPalette->update();
mLeftPalette->update();
}

@ -51,6 +51,7 @@ class UBBoardPaletteManager : public QObject
void showVirtualKeyboard(bool show = true); void showVirtualKeyboard(bool show = true);
void initPalettesPosAtStartup(); void initPalettesPosAtStartup();
void connectToDocumentController(); void connectToDocumentController();
void refreshPalettes();
UBKeyboardPalette *mKeyboardPalette; UBKeyboardPalette *mKeyboardPalette;
UBRightPalette* createDesktopRightPalette(QWidget* parent); UBRightPalette* createDesktopRightPalette(QWidget* parent);

@ -7,6 +7,7 @@
#include "document/UBDocumentProxy.h" #include "document/UBDocumentProxy.h"
#include "board/UBBoardController.h" #include "board/UBBoardController.h"
#include "board/UBBoardPaletteManager.h"
UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent)
, mpLayout(NULL) , mpLayout(NULL)
@ -119,6 +120,17 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent())); connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent()));
connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent()));
connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged()));
connect(mpPhasis, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged()));
connect(mpDuration, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged()));
connect(mpEquipment, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged()));
connect(mpActivity, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged()));
connect(mpAction1->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction1->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction2->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction2->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction3->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
connect(mpAction3->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged()));
} }
UBTeacherBarWidget::~UBTeacherBarWidget() UBTeacherBarWidget::~UBTeacherBarWidget()
@ -228,17 +240,17 @@ UBTeacherBarWidget::~UBTeacherBarWidget()
void UBTeacherBarWidget::populateCombos() void UBTeacherBarWidget::populateCombos()
{ {
QStringList qslPhasis; QStringList qslPhasis;
qslPhasis << tr("I discover") << tr("I experiment") << tr("I train myself") << tr("I play") << tr("I memorize"); qslPhasis << tr("") << tr("I discover") << tr("I experiment") << tr("I train myself") << tr("I play") << tr("I memorize");
mpPhasis->insertItems(0, qslPhasis); mpPhasis->insertItems(0, qslPhasis);
mpPhasis->setCurrentIndex(0); mpPhasis->setCurrentIndex(0);
QStringList qslDuration; QStringList qslDuration;
qslDuration << tr("Short") << tr("Middle") << tr("Long"); qslDuration << tr("") << tr("Short") << tr("Middle") << tr("Long");
mpDuration->insertItems(0, qslDuration); mpDuration->insertItems(0, qslDuration);
mpDuration->setCurrentIndex(0); mpDuration->setCurrentIndex(0);
QStringList qslActivity; QStringList qslActivity;
qslActivity << tr("Alone") << tr("By Group") << tr("All together"); qslActivity << tr("") << tr("Alone") << tr("By Group") << tr("All together");
mpActivity->insertItems(0, qslActivity); mpActivity->insertItems(0, qslActivity);
mpActivity->setCurrentIndex(0); mpActivity->setCurrentIndex(0);
} }
@ -276,6 +288,33 @@ void UBTeacherBarWidget::loadContent()
mpAction3->setStudentText(nextInfos.action3Student); mpAction3->setStudentText(nextInfos.action3Student);
} }
void UBTeacherBarWidget::onValueChanged()
{
if( mpTitle->text() == ""
&& mpDuration->currentIndex() == 0
&& mpPhasis->currentIndex() == 0
&& mpEquipment->text() == ""
&& mpActivity->currentIndex() == 0
&& mpAction1->teacherText() == ""
&& mpAction1->studentText() == ""
&& mpAction2->teacherText() == ""
&& mpAction2->studentText() == ""
&& mpAction3->teacherText() == ""
&& mpAction3->studentText() == "")
{
mIconToLeft = QPixmap(":images/teacher_open_disabled.png");
mIconToRight = QPixmap(":images/teacher_close_disabled.png");
}
else
{
mIconToLeft = QPixmap(":images/teacher_open.png");
mIconToRight = QPixmap(":images/teacher_close.png");
}
// TODO: refresh the icon
UBApplication::boardController->paletteManager()->refreshPalettes();
}
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)
@ -381,3 +420,13 @@ void UBTeacherStudentAction::setStudentText(QString text)
{ {
mpStudent->setText(text); mpStudent->setText(text);
} }
QTextEdit* UBTeacherStudentAction::teacher()
{
return mpTeacher;
}
QTextEdit* UBTeacherStudentAction::student()
{
return mpStudent;
}

@ -22,6 +22,8 @@ public:
QString studentText(); QString studentText();
void setTeacherText(QString text); void setTeacherText(QString text);
void setStudentText(QString text); void setStudentText(QString text);
QTextEdit* teacher();
QTextEdit* student();
private: private:
int mActionNumber; int mActionNumber;
@ -45,6 +47,7 @@ public:
private slots: private slots:
void saveContent(); void saveContent();
void loadContent(); void loadContent();
void onValueChanged();
private: private:
void populateCombos(); void populateCombos();

Loading…
Cancel
Save