Fixed lasts changes in bar du prof and added translations

resources/forms/mainWindow.ui

@@ -1625,6 +1625,14 @@
     <string>Ctrl+H</string>
    </property>
   </action>
+  <action name="actionImportUniboardDocuments">
+   <property name="text">
+    <string>Import Uniboard Documents</string>
+   </property>
+   <property name="toolTip">
+    <string>Import old Sankore or Uniboard documents</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../sankore.qrc"/>

src/core/UBApplication.cpp

@@ -263,6 +263,7 @@ int UBApplication::exec(const QString& pFileToImport)
     connect(mainWindow->actionMultiScreen, SIGNAL(triggered(bool)), applicationController, SLOT(useMultiScreen(bool)));
     connect(mainWindow->actionWidePageSize, SIGNAL(triggered(bool)), boardController, SLOT(setWidePageSize(bool)));
     connect(mainWindow->actionRegularPageSize, SIGNAL(triggered(bool)), boardController, SLOT(setRegularPageSize(bool)));
+    connect(mainWindow->actionImportUniboardDocuments, SIGNAL(triggered()), this, SLOT(importUniboardFiles()));
 
     connect(mainWindow->actionCut, SIGNAL(triggered()), applicationController, SLOT(actionCut()));
     connect(mainWindow->actionCopy, SIGNAL(triggered()), applicationController, SLOT(actionCopy()));
@@ -308,17 +309,17 @@ int UBApplication::exec(const QString& pFileToImport)
         }
     }
 
-    // SANKORE-47: Deactivate the Uniboard to Sankore transition if
-    // EnableUniboardTransition is set at false in Uniboard.config
-    if(UBSettings::settings()->appEnableUniboardTransition->get().toBool())
-    {
-        mUniboardSankoreTransition = new UniboardSankoreTransition();
-        mUniboardSankoreTransition->documentTransition();
-    }
+
 
     return QApplication::exec();
 }
 
+void UBApplication::importUniboardFiles()
+{
+    mUniboardSankoreTransition = new UniboardSankoreTransition();
+    mUniboardSankoreTransition->documentTransition();
+}
+
 #ifdef Q_WS_MAC
 void UBApplication::showMinimized()
 {
@@ -464,6 +465,7 @@ void UBApplication::decorateActionMenu(QAction* action)
             mainWindow->actionPodcast->setText(tr("Podcast"));
 #endif
             menu->addAction(mainWindow->actionMultiScreen);
+            menu->addAction(mainWindow->actionImportUniboardDocuments);
             menu->addSeparator();
             menu->addAction(mainWindow->actionQuit);
 
@@ -558,14 +560,14 @@ void UBApplication::cleanup()
 	if (boardController) delete boardController;
 	if (webController) delete webController;
 	if (documentController) delete documentController;
-	if (mUniboardSankoreTransition) delete mUniboardSankoreTransition;
+        if (mUniboardSankoreTransition) delete mUniboardSankoreTransition;
 
 
 	applicationController = NULL;
 	boardController = NULL;
 	webController = NULL;
 	documentController = NULL;
-	mUniboardSankoreTransition = NULL;
+        mUniboardSankoreTransition = NULL;
 }
 
 void UBStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,

src/core/UBApplication.h

@@ -114,7 +114,7 @@ class UBApplication : public QtSingleApplication
 #ifdef Q_WS_MAC
         void showMinimized();
 #endif
-
+        void importUniboardFiles();
     private:
 
         void updateProtoActionsState();

src/core/UBSettings.cpp

@@ -181,7 +181,6 @@ void UBSettings::init()
     appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
     navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 300);
     libPaletteWidth = new UBSetting(this, "Board", "LibPaletteWidth", 300);
-    appEnableUniboardTransition = new UBSetting(this, "App", "EnableUniboardTransition", true);
 
     appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
     appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");

src/core/UBSettings.h

@@ -201,7 +201,6 @@ class UBSettings : public QObject
         UBSetting* appEnableAutomaticSoftwareUpdates;
         UBSetting* appEnableSoftwareUpdates;
         UBSetting* appToolBarOrientationVertical;
-        UBSetting* appEnableUniboardTransition;
 
         UBSetting* appIsInSoftwareUpdateProcess;
 

src/gui/UBTeacherBarWidget.cpp

@@ -340,21 +340,23 @@ UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent
     mpTeacherLayout = new QHBoxLayout();
 
     //TODO: I'm not able to translate this string using the normal way *qm file why?
-   // mpTeacherLabel = new QLabel(tr("Teacher"), this);
+    //mpTeacherLabel = new QLabel(tr("Teacher"), this);
     mpTeacherLabel = new QLabel(tr("Enseignant"), this);
     mpTeacherLabel->setAlignment(Qt::AlignTop);
     mpTeacher = new QTextEdit(this);
     mpTeacher->setObjectName("TeacherStudentBox");
+    mpTeacher->setStyleSheet("background-color:#FF9F6D");
     mpTeacherLayout->addWidget(mpTeacherLabel, 0);
     mpTeacherLayout->addWidget(mpTeacher, 1);
     mpLayout->addLayout(mpTeacherLayout, 1);
 
     mpStudentLayout = new QHBoxLayout();
 //    mpStudentLabel = new QLabel(tr("Student"), this);
-    mpStudentLabel = new QLabel(tr("Étudiant"), this);
+    mpStudentLabel = new QLabel(tr("Élève"), this);
     mpStudentLabel->setAlignment(Qt::AlignTop);
     mpStudent = new QTextEdit(this);
     mpStudent->setObjectName("TeacherStudentBox");
+    mpStudent->setStyleSheet("background-color:#06E983");
     mpStudentLayout->addWidget(mpStudentLabel, 0);
     mpStudentLayout->addWidget(mpStudent, 1);
     mpLayout->addLayout(mpStudentLayout, 1);

src/transition/UniboardSankoreTransition.cpp

@@ -19,6 +19,7 @@
 #include "frameworks/UBFileSystemUtils.h"
 #include "core/UBApplication.h"
 #include "core/UBPersistenceManager.h"
+#include "gui/UBMainWindow.h"
 
 UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) :
     QObject(parent)
@@ -36,6 +37,7 @@ UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) :
 #endif
     connect(this, SIGNAL(docAdded(UBDocumentProxy*)), UBPersistenceManager::persistenceManager(), SIGNAL(documentCreated(UBDocumentProxy*)));
 }
+
 UniboardSankoreTransition::~UniboardSankoreTransition()
 {
     if(NULL != mTransitionDlg)
@@ -91,6 +93,9 @@ void UniboardSankoreTransition::documentTransition()
             mTransitionDlg->show();
         }
     }
+    else{
+        UBApplication::mainWindow->information(tr("Import old Uniboard/Sankore documents"), tr("There are no documents that should be imported"));
+    }
 }
 
 void UniboardSankoreTransition::startDocumentTransition()
@@ -254,7 +259,7 @@ void UniboardSankoreTransition::executeTransition()
     }
 
     if (!result){
-        qWarning() << "The transaction has failed";
+        qWarning() << "The transition has failed";
         rollbackDocumentsTransition(fileInfoList);
         UBFileSystemUtils::deleteDir(backupDestinationPath);
     }