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

Conflicts:
	src/gui/UBTeacherBarWidget.cpp
preferencesAboutTextFull
shibakaneki 13 years ago
commit 07241990f5
  1. 7
      src/gui/UBTeacherBarWidget.cpp

@ -352,6 +352,8 @@ void UBTeacherBarWidget::loadContent()
mpComments->document()->setPlainText(nextInfos.comments); mpComments->document()->setPlainText(nextInfos.comments);
} }
mpPreview->mediaViewer()->cleanMedia();
if(!isEmpty()){ if(!isEmpty()){
// Update the fields of the preview widget // Update the fields of the preview widget
mpPreview->setTitle(mpTitle->text()); mpPreview->setTitle(mpTitle->text());
@ -365,7 +367,6 @@ void UBTeacherBarWidget::loadContent()
}else{ }else{
mpPreview->setDuration(eDuration_ThreeQuarter); mpPreview->setDuration(eDuration_ThreeQuarter);
} }
mpPreview->clean(); mpPreview->clean();
// Add the actions // Add the actions
@ -393,6 +394,10 @@ void UBTeacherBarWidget::loadContent()
// Add the comments // Add the comments
mpPreview->setComments(mpComments->document()->toPlainText()); mpPreview->setComments(mpComments->document()->toPlainText());
} }
else{
mpStackWidget->setCurrentWidget(mpContainer);
}
} }

Loading…
Cancel
Save