fixed some working issue on english

preferencesAboutTextFull
Claudio Valerio 13 years ago
parent 76d5c99e21
commit f0734e7117
  1. 12
      src/adaptors/UBMetadataDcSubsetAdaptor.cpp
  2. 6
      src/core/UBSettings.cpp
  3. 4
      src/core/UBSettings.h
  4. 4
      src/document/UBDocumentProxy.cpp
  5. 116
      src/gui/UBTeacherGuideWidget.cpp
  6. 12
      src/gui/UBTeacherGuideWidget.h

@ -112,10 +112,10 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy)
// introduced in OpenSankore 1.40.00 // introduced in OpenSankore 1.40.00
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionAuthors,proxy->metaData(UBSettings::sessionAuthors).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionAuthors,proxy->metaData(UBSettings::sessionAuthors).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionGoals,proxy->metaData(UBSettings::sessionGoals).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionObjectives,proxy->metaData(UBSettings::sessionObjectives).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionKeywords,proxy->metaData(UBSettings::sessionKeywords).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionKeywords,proxy->metaData(UBSettings::sessionKeywords).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionGradeLevel,proxy->metaData(UBSettings::sessionGradeLevel).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionGradeLevel,proxy->metaData(UBSettings::sessionGradeLevel).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionBranch,proxy->metaData(UBSettings::sessionBranch).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionSubjects,proxy->metaData(UBSettings::sessionSubjects).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionType,proxy->metaData(UBSettings::sessionType).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionType,proxy->metaData(UBSettings::sessionType).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLicence,proxy->metaData(UBSettings::sessionLicence).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLicence,proxy->metaData(UBSettings::sessionLicence).toString());
@ -228,10 +228,10 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
{ {
metadata.insert(UBSettings::sessionAuthors, xml.readElementText()); metadata.insert(UBSettings::sessionAuthors, xml.readElementText());
} }
else if (xml.name() == UBSettings::sessionGoals // introduced in OpenSankore 1.40.00 else if (xml.name() == UBSettings::sessionObjectives // introduced in OpenSankore 1.40.00
&& xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
{ {
metadata.insert(UBSettings::sessionGoals, xml.readElementText()); metadata.insert(UBSettings::sessionObjectives, xml.readElementText());
} }
else if (xml.name() == UBSettings::sessionKeywords // introduced in OpenSankore 1.40.00 else if (xml.name() == UBSettings::sessionKeywords // introduced in OpenSankore 1.40.00
&& xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
@ -243,10 +243,10 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
{ {
metadata.insert(UBSettings::sessionGradeLevel, xml.readElementText()); metadata.insert(UBSettings::sessionGradeLevel, xml.readElementText());
} }
else if (xml.name() == UBSettings::sessionBranch // introduced in OpenSankore 1.40.00 else if (xml.name() == UBSettings::sessionSubjects // introduced in OpenSankore 1.40.00
&& xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
{ {
metadata.insert(UBSettings::sessionBranch, xml.readElementText()); metadata.insert(UBSettings::sessionSubjects, xml.readElementText());
} }
else if (xml.name() == UBSettings::sessionType // introduced in OpenSankore 1.40.00 else if (xml.name() == UBSettings::sessionType // introduced in OpenSankore 1.40.00
&& xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)

@ -38,10 +38,10 @@ QString UBSettings::documentVersion = QString("Version");
QString UBSettings::documentUpdatedAt = QString("UpdatedAt"); QString UBSettings::documentUpdatedAt = QString("UpdatedAt");
QString UBSettings::sessionTitle = QString("sessionTitle"); QString UBSettings::sessionTitle = QString("sessionTitle");
QString UBSettings::sessionAuthors = QString("sessionAuthors"); QString UBSettings::sessionAuthors = QString("sessionAuthors");
QString UBSettings::sessionGoals = QString("sessionGoals"); QString UBSettings::sessionObjectives = QString("sessionObjectives");
QString UBSettings::sessionKeywords = QString("sessionKeywords"); QString UBSettings::sessionKeywords = QString("sessionKeywords");
QString UBSettings::sessionGradeLevel = QString("sessionGradeLevel"); QString UBSettings::sessionGradeLevel = QString("sessionGradeLevel");
QString UBSettings::sessionBranch = QString("sessionBranch"); QString UBSettings::sessionSubjects = QString("sessionSubjects");
QString UBSettings::sessionType = QString("sessionType"); QString UBSettings::sessionType = QString("sessionType");
QString UBSettings::sessionLicence = QString("sessionLicence"); QString UBSettings::sessionLicence = QString("sessionLicence");
QString UBSettings::documentDate = QString("date"); QString UBSettings::documentDate = QString("date");
@ -55,7 +55,7 @@ QString UBSettings::uniboardApplicationNamespaceUri = "http://uniboard.mnemis.co
const int UBSettings::sDefaultFontPixelSize = 36; const int UBSettings::sDefaultFontPixelSize = 36;
const char *UBSettings::sDefaultFontFamily = "Arial"; const char *UBSettings::sDefaultFontFamily = "Arial";
QString UBSettings::currentFileVersion = "4.5.0"; QString UBSettings::currentFileVersion = "4.6.0";
QColor UBSettings::crossDarkBackground = QColor(44, 44, 44, 200); QColor UBSettings::crossDarkBackground = QColor(44, 44, 44, 200);
QColor UBSettings::crossLightBackground = QColor(165, 225, 255); QColor UBSettings::crossLightBackground = QColor(165, 225, 255);

@ -156,10 +156,10 @@ class UBSettings : public QObject
static QString sessionTitle; static QString sessionTitle;
static QString sessionAuthors; static QString sessionAuthors;
static QString sessionGoals; static QString sessionObjectives;
static QString sessionKeywords; static QString sessionKeywords;
static QString sessionGradeLevel; static QString sessionGradeLevel;
static QString sessionBranch; static QString sessionSubjects;
static QString sessionType; static QString sessionType;
static QString sessionLicence; static QString sessionLicence;

@ -53,10 +53,10 @@ void UBDocumentProxy::init()
//teacherGuide metadata //teacherGuide metadata
setMetaData(UBSettings::sessionTitle,""); setMetaData(UBSettings::sessionTitle,"");
setMetaData(UBSettings::sessionAuthors,""); setMetaData(UBSettings::sessionAuthors,"");
setMetaData(UBSettings::sessionGoals,""); setMetaData(UBSettings::sessionObjectives,"");
setMetaData(UBSettings::sessionKeywords,""); setMetaData(UBSettings::sessionKeywords,"");
setMetaData(UBSettings::sessionGradeLevel,""); setMetaData(UBSettings::sessionGradeLevel,"");
setMetaData(UBSettings::sessionBranch,""); setMetaData(UBSettings::sessionSubjects,"");
setMetaData(UBSettings::sessionType,""); setMetaData(UBSettings::sessionType,"");
setMetaData(UBSettings::sessionLicence,""); setMetaData(UBSettings::sessionLicence,"");
} }

@ -594,18 +594,18 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
, mpSeparatorAuthors(NULL) , mpSeparatorAuthors(NULL)
, mpCreationLabel(NULL) , mpCreationLabel(NULL)
, mpLastModifiedLabel(NULL) , mpLastModifiedLabel(NULL)
, mpGoalsLabel(NULL) , mpObjectivesLabel(NULL)
, mpGoals(NULL) , mpObjectives(NULL)
, mpSeparatorGoals(NULL) , mpSeparatorObjectives(NULL)
, mpIndexLabel(NULL) , mpIndexLabel(NULL)
, mpKeywordsLabel(NULL) , mpKeywordsLabel(NULL)
, mpKeywords(NULL) , mpKeywords(NULL)
, mpSchoolLevelItemLabel(NULL) , mpSchoolLevelItemLabel(NULL)
, mpSchoolLevelBox(NULL) , mpSchoolLevelBox(NULL)
, mpSchoolLevelValueLabel(NULL) , mpSchoolLevelValueLabel(NULL)
, mpSchoolBranchItemLabel(NULL) , mpSchoolSubjectsItemLabel(NULL)
, mpSchoolBranchBox(NULL) , mpSchoolSubjectsBox(NULL)
, mpSchoolBranchValueLabel(NULL) , mpSchoolSubjectsValueLabel(NULL)
, mpSchoolTypeItemLabel(NULL) , mpSchoolTypeItemLabel(NULL)
, mpSchoolTypeBox(NULL) , mpSchoolTypeBox(NULL)
, mpSchoolTypeValueLabel(NULL) , mpSchoolTypeValueLabel(NULL)
@ -670,21 +670,21 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpSeparatorAuthors->setObjectName("UBTGSeparator"); mpSeparatorAuthors->setObjectName("UBTGSeparator");
mpLayout->addWidget(mpSeparatorAuthors); mpLayout->addWidget(mpSeparatorAuthors);
mpGoalsLabel = new QLabel(this); mpObjectivesLabel = new QLabel(this);
mpGoalsLabel->setObjectName("UBTGZeroPageEditionModeTitle"); mpObjectivesLabel->setObjectName("UBTGZeroPageEditionModeTitle");
mpGoalsLabel->setText(tr("Goal(s)")); mpObjectivesLabel->setText(tr("Objective(s)"));
mpGoalsLabel->setStyleSheet(chapterStyle); mpObjectivesLabel->setStyleSheet(chapterStyle);
mpLayout->addWidget(mpGoalsLabel); mpLayout->addWidget(mpObjectivesLabel);
mpGoals = new UBTGAdaptableText(0,this); mpObjectives = new UBTGAdaptableText(0,this);
mpGoals->setObjectName("UBTGZeroPageInputText"); mpObjectives->setObjectName("UBTGZeroPageInputText");
mpGoals->setPlaceHolderText(tr("Type goals here...")); mpObjectives->setPlaceHolderText(tr("Type objectives here..."));
mpLayout->addWidget(mpGoals); mpLayout->addWidget(mpObjectives);
mpSeparatorGoals = new QFrame(this); mpSeparatorObjectives = new QFrame(this);
mpSeparatorGoals->setFixedHeight(UBTG_SEPARATOR_FIXED_HEIGHT); mpSeparatorObjectives->setFixedHeight(UBTG_SEPARATOR_FIXED_HEIGHT);
mpSeparatorGoals->setObjectName("UBTGSeparator"); mpSeparatorObjectives->setObjectName("UBTGSeparator");
mpLayout->addWidget(mpSeparatorGoals); mpLayout->addWidget(mpSeparatorObjectives);
mpIndexLabel = new QLabel(this); mpIndexLabel = new QLabel(this);
mpIndexLabel->setObjectName("UBTGZeroPageEditionModeTitle"); mpIndexLabel->setObjectName("UBTGZeroPageEditionModeTitle");
@ -713,16 +713,16 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpSchoolLevelValueLabel = new QLabel(this); mpSchoolLevelValueLabel = new QLabel(this);
mpLayout->addWidget(mpSchoolLevelValueLabel); mpLayout->addWidget(mpSchoolLevelValueLabel);
mpSchoolBranchItemLabel = new QLabel(this); mpSchoolSubjectsItemLabel = new QLabel(this);
mpSchoolBranchItemLabel->setObjectName("UBTGZeroPageItemLabel"); mpSchoolSubjectsItemLabel->setObjectName("UBTGZeroPageItemLabel");
mpSchoolBranchItemLabel->setText(tr("Branch:")); mpSchoolSubjectsItemLabel->setText(tr("Subjects:"));
mpSchoolBranchItemLabel->setStyleSheet(chapterStyle); mpSchoolSubjectsItemLabel->setStyleSheet(chapterStyle);
mpLayout->addWidget(mpSchoolBranchItemLabel); mpLayout->addWidget(mpSchoolSubjectsItemLabel);
mpSchoolBranchBox = new QComboBox(this); mpSchoolSubjectsBox = new QComboBox(this);
mpSchoolBranchBox->setObjectName("DockPaletteWidgetComboBox"); mpSchoolSubjectsBox->setObjectName("DockPaletteWidgetComboBox");
mpLayout->addWidget(mpSchoolBranchBox); mpLayout->addWidget(mpSchoolSubjectsBox);
mpSchoolBranchValueLabel = new QLabel(this); mpSchoolSubjectsValueLabel = new QLabel(this);
mpLayout->addWidget(mpSchoolBranchValueLabel); mpLayout->addWidget(mpSchoolSubjectsValueLabel);
mpSchoolTypeItemLabel = new QLabel(this); mpSchoolTypeItemLabel = new QLabel(this);
mpSchoolTypeItemLabel->setObjectName("UBTGZeroPageItemLabel"); mpSchoolTypeItemLabel->setObjectName("UBTGZeroPageItemLabel");
@ -771,16 +771,16 @@ UBTeacherGuidePageZeroWidget::~UBTeacherGuidePageZeroWidget()
DELETEPTR(mpSeparatorAuthors); DELETEPTR(mpSeparatorAuthors);
DELETEPTR(mpCreationLabel); DELETEPTR(mpCreationLabel);
DELETEPTR(mpLastModifiedLabel); DELETEPTR(mpLastModifiedLabel);
DELETEPTR(mpGoalsLabel); DELETEPTR(mpObjectivesLabel);
DELETEPTR(mpGoals); DELETEPTR(mpObjectives);
DELETEPTR(mpSeparatorGoals); DELETEPTR(mpSeparatorObjectives);
DELETEPTR(mpIndexLabel); DELETEPTR(mpIndexLabel);
DELETEPTR(mpKeywordsLabel); DELETEPTR(mpKeywordsLabel);
DELETEPTR(mpKeywords); DELETEPTR(mpKeywords);
DELETEPTR(mpSchoolLevelItemLabel); DELETEPTR(mpSchoolLevelItemLabel);
DELETEPTR(mpSchoolLevelBox); DELETEPTR(mpSchoolLevelBox);
DELETEPTR(mpSchoolBranchItemLabel); DELETEPTR(mpSchoolSubjectsItemLabel);
DELETEPTR(mpSchoolBranchBox); DELETEPTR(mpSchoolSubjectsBox);
DELETEPTR(mpSchoolTypeItemLabel); DELETEPTR(mpSchoolTypeItemLabel);
DELETEPTR(mpSchoolTypeBox); DELETEPTR(mpSchoolTypeBox);
DELETEPTR(mpSeparatorIndex); DELETEPTR(mpSeparatorIndex);
@ -853,15 +853,15 @@ void UBTeacherGuidePageZeroWidget::fillComboBoxes()
void UBTeacherGuidePageZeroWidget::onSchoolLevelChanged(QString schoolLevel) void UBTeacherGuidePageZeroWidget::onSchoolLevelChanged(QString schoolLevel)
{ {
QStringList subjects = mSubjects.value(mGradeLevelsMap.value(schoolLevel)); QStringList subjects = mSubjects.value(mGradeLevelsMap.value(schoolLevel));
mpSchoolBranchBox->clear(); mpSchoolSubjectsBox->clear();
if(subjects.count()){ if(subjects.count()){
mpSchoolBranchItemLabel->setEnabled(true); mpSchoolSubjectsItemLabel->setEnabled(true);
mpSchoolBranchBox->setEnabled(true); mpSchoolSubjectsBox->setEnabled(true);
mpSchoolBranchBox->addItems(subjects); mpSchoolSubjectsBox->addItems(subjects);
} }
else{ else{
mpSchoolBranchItemLabel->setDisabled(true); mpSchoolSubjectsItemLabel->setDisabled(true);
mpSchoolBranchBox->setDisabled(true); mpSchoolSubjectsBox->setDisabled(true);
} }
} }
@ -889,14 +889,14 @@ void UBTeacherGuidePageZeroWidget::loadData()
UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument();
mpSessionTitle->setText(documentProxy->metaData(UBSettings::sessionTitle).toString()); mpSessionTitle->setText(documentProxy->metaData(UBSettings::sessionTitle).toString());
mpAuthors->setText(documentProxy->metaData(UBSettings::sessionAuthors).toString()); mpAuthors->setText(documentProxy->metaData(UBSettings::sessionAuthors).toString());
mpGoals->setText(documentProxy->metaData(UBSettings::sessionGoals).toString()); mpObjectives->setText(documentProxy->metaData(UBSettings::sessionObjectives).toString());
mpKeywords->setText(documentProxy->metaData(UBSettings::sessionKeywords).toString()); mpKeywords->setText(documentProxy->metaData(UBSettings::sessionKeywords).toString());
int currentIndex = mpSchoolLevelBox->findText(documentProxy->metaData(UBSettings::sessionGradeLevel).toString()); int currentIndex = mpSchoolLevelBox->findText(documentProxy->metaData(UBSettings::sessionGradeLevel).toString());
mpSchoolLevelBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0); mpSchoolLevelBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0);
currentIndex = mpSchoolBranchBox->findText(documentProxy->metaData(UBSettings::sessionBranch).toString()); currentIndex = mpSchoolSubjectsBox->findText(documentProxy->metaData(UBSettings::sessionSubjects).toString());
mpSchoolBranchBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0); mpSchoolSubjectsBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0);
currentIndex = mpSchoolTypeBox->findText(documentProxy->metaData(UBSettings::sessionType).toString()); currentIndex = mpSchoolTypeBox->findText(documentProxy->metaData(UBSettings::sessionType).toString());
mpSchoolTypeBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0); mpSchoolTypeBox->setCurrentIndex((currentIndex!=-1) ? currentIndex : 0);
@ -913,10 +913,10 @@ void UBTeacherGuidePageZeroWidget::persistData()
UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument();
documentProxy->setMetaData(UBSettings::sessionTitle,mpSessionTitle->text()); documentProxy->setMetaData(UBSettings::sessionTitle,mpSessionTitle->text());
documentProxy->setMetaData(UBSettings::sessionAuthors, mpAuthors->text()); documentProxy->setMetaData(UBSettings::sessionAuthors, mpAuthors->text());
documentProxy->setMetaData(UBSettings::sessionGoals,mpGoals->text()); documentProxy->setMetaData(UBSettings::sessionObjectives,mpObjectives->text());
documentProxy->setMetaData(UBSettings::sessionKeywords,mpKeywords->text()); documentProxy->setMetaData(UBSettings::sessionKeywords,mpKeywords->text());
documentProxy->setMetaData(UBSettings::sessionGradeLevel,mpSchoolLevelBox->currentText()); documentProxy->setMetaData(UBSettings::sessionGradeLevel,mpSchoolLevelBox->currentText());
documentProxy->setMetaData(UBSettings::sessionBranch,mpSchoolBranchBox->currentText()); documentProxy->setMetaData(UBSettings::sessionSubjects,mpSchoolSubjectsBox->currentText());
documentProxy->setMetaData(UBSettings::sessionType,mpSchoolTypeBox->currentText()); documentProxy->setMetaData(UBSettings::sessionType,mpSchoolTypeBox->currentText());
documentProxy->setMetaData(UBSettings::sessionLicence,mpLicenceBox->currentText()); documentProxy->setMetaData(UBSettings::sessionLicence,mpLicenceBox->currentText());
} }
@ -942,16 +942,16 @@ void UBTeacherGuidePageZeroWidget::switchToMode(tUBTGZeroPageMode mode)
mpAuthors->setReadOnly(false); mpAuthors->setReadOnly(false);
mpAuthors->setStyleSheet(inputStyleSheet); mpAuthors->setStyleSheet(inputStyleSheet);
mpAuthors->setTextColor(QColor(Qt::lightGray)); mpAuthors->setTextColor(QColor(Qt::lightGray));
mpGoals->setReadOnly(false); mpObjectives->setReadOnly(false);
mpGoals->setStyleSheet(inputStyleSheet); mpObjectives->setStyleSheet(inputStyleSheet);
mpGoals->setTextColor(QColor(Qt::lightGray)); mpObjectives->setTextColor(QColor(Qt::lightGray));
mpKeywords->setReadOnly(false); mpKeywords->setReadOnly(false);
mpKeywords->setStyleSheet(inputStyleSheet); mpKeywords->setStyleSheet(inputStyleSheet);
mpKeywords->setTextColor(QColor(Qt::lightGray)); mpKeywords->setTextColor(QColor(Qt::lightGray));
mpSchoolLevelValueLabel->hide(); mpSchoolLevelValueLabel->hide();
mpSchoolLevelBox->show(); mpSchoolLevelBox->show();
mpSchoolBranchValueLabel->hide(); mpSchoolSubjectsValueLabel->hide();
mpSchoolBranchBox->show(); mpSchoolSubjectsBox->show();
mpSchoolTypeValueLabel->hide(); mpSchoolTypeValueLabel->hide();
mpSchoolTypeBox->show(); mpSchoolTypeBox->show();
mpLicenceIcon->hide(); mpLicenceIcon->hide();
@ -969,18 +969,18 @@ void UBTeacherGuidePageZeroWidget::switchToMode(tUBTGZeroPageMode mode)
mpAuthors->setStyleSheet(inputStyleSheet); mpAuthors->setStyleSheet(inputStyleSheet);
mpAuthors->setTextColor(QColor(Qt::black)); mpAuthors->setTextColor(QColor(Qt::black));
mpAuthors->showText(mpAuthors->text()); mpAuthors->showText(mpAuthors->text());
mpGoals->setStyleSheet(inputStyleSheet); mpObjectives->setStyleSheet(inputStyleSheet);
mpGoals->setTextColor(QColor(Qt::black)); mpObjectives->setTextColor(QColor(Qt::black));
mpGoals->showText(mpGoals->text()); mpObjectives->showText(mpObjectives->text());
mpKeywords->setStyleSheet(inputStyleSheet); mpKeywords->setStyleSheet(inputStyleSheet);
mpKeywords->setTextColor(QColor(Qt::black)); mpKeywords->setTextColor(QColor(Qt::black));
mpKeywords->showText(mpKeywords->text()); mpKeywords->showText(mpKeywords->text());
mpSchoolLevelValueLabel->setText(mpSchoolLevelBox->currentText()); mpSchoolLevelValueLabel->setText(mpSchoolLevelBox->currentText());
mpSchoolLevelValueLabel->show(); mpSchoolLevelValueLabel->show();
mpSchoolLevelBox->hide(); mpSchoolLevelBox->hide();
mpSchoolBranchValueLabel->setText(mpSchoolBranchBox->currentText()); mpSchoolSubjectsValueLabel->setText(mpSchoolSubjectsBox->currentText());
mpSchoolBranchValueLabel->show(); mpSchoolSubjectsValueLabel->show();
mpSchoolBranchBox->hide(); mpSchoolSubjectsBox->hide();
mpSchoolTypeValueLabel->setText(mpSchoolTypeBox->currentText()); mpSchoolTypeValueLabel->setText(mpSchoolTypeBox->currentText());
mpSchoolTypeValueLabel->show(); mpSchoolTypeValueLabel->show();
mpSchoolTypeBox->hide(); mpSchoolTypeBox->hide();
@ -1022,7 +1022,7 @@ QVector<tUBGEElementNode*> UBTeacherGuidePageZeroWidget::getData()
elementNode = new tUBGEElementNode(); elementNode = new tUBGEElementNode();
elementNode->name = "goals"; elementNode->name = "goals";
elementNode->attributes.insert("value",mpGoals->text()); elementNode->attributes.insert("value",mpObjectives->text());
result << elementNode; result << elementNode;
elementNode = new tUBGEElementNode(); elementNode = new tUBGEElementNode();
@ -1037,7 +1037,7 @@ QVector<tUBGEElementNode*> UBTeacherGuidePageZeroWidget::getData()
elementNode = new tUBGEElementNode(); elementNode = new tUBGEElementNode();
elementNode->name = "schoolBranch"; elementNode->name = "schoolBranch";
elementNode->attributes.insert("value",mpSchoolBranchBox->currentText()); elementNode->attributes.insert("value",mpSchoolSubjectsBox->currentText());
result << elementNode; result << elementNode;
elementNode = new tUBGEElementNode(); elementNode = new tUBGEElementNode();

@ -150,9 +150,9 @@ private:
QLabel* mpCreationLabel; QLabel* mpCreationLabel;
QLabel* mpLastModifiedLabel; QLabel* mpLastModifiedLabel;
QLabel* mpGoalsLabel; QLabel* mpObjectivesLabel;
UBTGAdaptableText* mpGoals; UBTGAdaptableText* mpObjectives;
QFrame* mpSeparatorGoals; QFrame* mpSeparatorObjectives;
QLabel* mpIndexLabel; QLabel* mpIndexLabel;
QLabel* mpKeywordsLabel; QLabel* mpKeywordsLabel;
@ -162,9 +162,9 @@ private:
QComboBox* mpSchoolLevelBox; QComboBox* mpSchoolLevelBox;
QLabel* mpSchoolLevelValueLabel; QLabel* mpSchoolLevelValueLabel;
QLabel* mpSchoolBranchItemLabel; QLabel* mpSchoolSubjectsItemLabel;
QComboBox* mpSchoolBranchBox; QComboBox* mpSchoolSubjectsBox;
QLabel* mpSchoolBranchValueLabel; QLabel* mpSchoolSubjectsValueLabel;
QLabel* mpSchoolTypeItemLabel; QLabel* mpSchoolTypeItemLabel;
QComboBox* mpSchoolTypeBox; QComboBox* mpSchoolTypeBox;

Loading…
Cancel
Save