diff --git a/resources/etc/SankoreEditor/editor_en/files/calepin.png b/resources/etc/SankoreEditor/editor_en/files/calepin.png deleted file mode 100644 index e710d8c0..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/files/calepin.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/files/logo.png b/resources/etc/SankoreEditor/editor_en/files/logo.png deleted file mode 100644 index e1a85e35..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/files/logo.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/files/logoplanetesankore.png b/resources/etc/SankoreEditor/editor_en/files/logoplanetesankore.png deleted file mode 100644 index c6f4ac3a..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/files/logoplanetesankore.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/files/mappe.png b/resources/etc/SankoreEditor/editor_en/files/mappe.png deleted file mode 100644 index f9548bee..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/files/mappe.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/files/outils.png b/resources/etc/SankoreEditor/editor_en/files/outils.png deleted file mode 100644 index 0ef1c5bb..00000000 Binary files a/resources/etc/SankoreEditor/editor_en/files/outils.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_en/index.html b/resources/etc/SankoreEditor/editor_en/index.html deleted file mode 100644 index e9aaa661..00000000 --- a/resources/etc/SankoreEditor/editor_en/index.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - -Sankoré editor - - - - - - - - - - - - - - - - - - - - - - - - - - -

editeur

-

Instructions on how to use Sankoré editor

-

THE CURRENT VERSION IS ONLY AVAILABLE IN FRENCH

outils mappe calepin

Sankoré Editor allows you to create rich interactivity scenarios. Create interactive content easily with basic activities that can be used in various subjects (attach images, sounds, order of words, phrases, create categories ...). This content can then be added to the software Open-Sankore.

Requirement to work with the editor :

-
    -
  • a Web access
    • -
  • an account on Planète Sankoré
    • -
-

 

-

Click here to connect to the Sankoré Editor

-

 

-

 

-

 

Sankoré editor is hosted on planete.sankore.org
-

 

- - diff --git a/resources/etc/SankoreEditor/editor_fr/files/calepin.png b/resources/etc/SankoreEditor/editor_fr/files/calepin.png deleted file mode 100644 index e710d8c0..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/files/calepin.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/files/logo.png b/resources/etc/SankoreEditor/editor_fr/files/logo.png deleted file mode 100644 index e1a85e35..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/files/logo.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/files/logoplanetesankore.png b/resources/etc/SankoreEditor/editor_fr/files/logoplanetesankore.png deleted file mode 100644 index c6f4ac3a..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/files/logoplanetesankore.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/files/mappe.png b/resources/etc/SankoreEditor/editor_fr/files/mappe.png deleted file mode 100644 index f9548bee..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/files/mappe.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/files/outils.png b/resources/etc/SankoreEditor/editor_fr/files/outils.png deleted file mode 100644 index 0ef1c5bb..00000000 Binary files a/resources/etc/SankoreEditor/editor_fr/files/outils.png and /dev/null differ diff --git a/resources/etc/SankoreEditor/editor_fr/index.html b/resources/etc/SankoreEditor/editor_fr/index.html deleted file mode 100644 index c3288659..00000000 --- a/resources/etc/SankoreEditor/editor_fr/index.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - -Editeur Sankoré - - - - - - - - - - - - - - - - - - - - - - - - - - -

editeur

-

Instructions pour l'utilisation de l'éditeur Sankoré

outils mappe calepin
L'éditeur Sankoré vous permet de réaliser des scénarios d'interactivités riches. Il facilite la création de contenu interactif avec des activités de base qui peuvent être utilisées dans diverses disciplines (associer des images, des sons, ordonner des mots, des phrases, créer des catégories...). Ce contenu peut ensuite être ajouté à votre cours sur le logiciel Open-Sankoré. L'éditeur repose sur votre compte utilisateur Planète Sankoré.

Éléments requis pour travailler avec l'éditeur :

-
    -
  • un accès Web
    • -
  • un compte Planète Sankoré
    • -
-

 

-

Accès à l'éditeur Sankoré

-

 

-

 

-

 

L'éditeur Sankoré est hébergé sur planete.sankore.org
-

 

- - diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 06ea51ab..575d475d 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1596,18 +1596,6 @@ Check Update - - - - :/images/toolbar/paraschool.png:/images/toolbar/paraschool.png - - - Open-Sankoré Editor - - - Show Open-Sankoré Widgets Editor - - @@ -1623,14 +1611,6 @@ Ctrl+H - - - Import Uniboard Documents - - - Import old Sankore or Uniboard documents - - true diff --git a/resources/images/toolbar/paraschool.png b/resources/images/toolbar/paraschool.png deleted file mode 100644 index bdb6da43..00000000 Binary files a/resources/images/toolbar/paraschool.png and /dev/null differ diff --git a/resources/sankore.qrc b/resources/sankore.qrc index fcefa2e8..b98a501b 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -295,7 +295,6 @@ images/toolbar/updates.png images/paletteLibrary.png images/paletteNavigator.png - images/toolbar/paraschool.png images/toolbar/display.png images/toolbar/hide.png images/toolbar/record.png diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 086da59b..2595dc98 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -175,7 +175,7 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() void UBBoardPaletteManager::slot_changeMainMode(UBApplicationController::MainMode mainMode) { -// Board = 0, Internet, Document, Tutorial, ParaschoolEditor, WebDocument +// Board = 0, Internet, Document, Tutorial, WebDocument switch( mainMode ) { diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index a0e12edb..d24bb14b 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -349,7 +349,6 @@ int UBApplication::exec(const QString& pFileToImport) connect(mainWindow->actionPreferences, SIGNAL(triggered()), mPreferencesController, SLOT(show())); connect(mainWindow->actionTutorial, SIGNAL(triggered()), applicationController, SLOT(showTutorial())); connect(mainWindow->actionTutorial, SIGNAL(triggered()), this, SLOT(stopScript())); - connect(mainWindow->actionSankoreEditor, SIGNAL(triggered()), applicationController, SLOT(showSankoreEditor())); connect(mainWindow->actionCheckUpdate, SIGNAL(triggered()), applicationController, SLOT(checkUpdateRequest())); @@ -543,7 +542,6 @@ void UBApplication::decorateActionMenu(QAction* action) menu->addSeparator(); menu->addAction(mainWindow->actionTutorial); - menu->addAction(mainWindow->actionSankoreEditor); #ifndef Q_WS_X11 // No Podcast on Linux yet menu->addAction(mainWindow->actionPodcast); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 3922a385..b24daa25 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -513,34 +513,6 @@ void UBApplicationController::showTutorial() } -void UBApplicationController::showSankoreEditor() -{ - - if (UBApplication::boardController) - { - UBApplication::boardController->persistCurrentScene(); - UBApplication::boardController->hide(); - } - -// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know - UBApplication::webController->show(UBWebController::Paraschool); - - mMainWindow->webToolBar->hide(); - mMainWindow->boardToolBar->hide(); - mMainWindow->documentToolBar->hide(); - mMainWindow->tutorialToolBar->show(); - - - mMainMode = ParaschoolEditor; - - adaptToolBar(); - - mUninoteController->hideWindow(); - - mirroringEnabled(false); - emit mainModeChanged(mMainMode); -} - void UBApplicationController::checkUpdate() { if(mHttp) @@ -622,10 +594,6 @@ void UBApplicationController::hideDesktop() { showTutorial(); } - else if (mMainMode == ParaschoolEditor) - { - showSankoreEditor(); - } mIsShowingDesktop = false; diff --git a/src/core/UBApplicationController.h b/src/core/UBApplicationController.h index 77f6433f..189dfe55 100644 --- a/src/core/UBApplicationController.h +++ b/src/core/UBApplicationController.h @@ -92,7 +92,7 @@ class UBApplicationController : public QObject enum MainMode { - Board = 0, Internet, Document, Tutorial, ParaschoolEditor, WebDocument + Board = 0, Internet, Document, Tutorial, WebDocument }; MainMode displayMode() @@ -137,7 +137,6 @@ class UBApplicationController : public QObject void actionPaste(); void showTutorial(); - void showSankoreEditor(); void checkUpdateRequest(); void checkUpdateAtLaunch(); diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index 3a4075f8..1ec52624 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -56,7 +56,6 @@ #include "core/memcheck.h" -class UBGraphicsParaschoolEditorWidgetItem; DelegateButton::DelegateButton(const QString & fileName, QGraphicsItem* pDelegated, QGraphicsItem * parent, Qt::WindowFrameSection section) : QGraphicsSvgItem(fileName, parent) diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index 87837e34..3a36c2c6 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -75,7 +75,6 @@ UBWebController::UBWebController(UBMainWindow* mainWindow) mStackedWidget = new QStackedWidget(); mStackedWidget->addWidget(new QWidget(mStackedWidget)); mStackedWidget->addWidget(new QWidget(mStackedWidget)); - mStackedWidget->addWidget(new QWidget(mStackedWidget)); mMainWindow->addWebWidget(mStackedWidget); @@ -246,62 +245,6 @@ void UBWebController::tutorialWebInstance() } -void UBWebController::paraschoolWebInstance() -{ - QLocale locale = QLocale(); - QString language = "_" + locale.name().left(2); - QString editorPath = "/etc/SankoreEditor/editor" + language + "/index.html"; - QString editorHtmlIndexFile; -#if defined(Q_WS_MAC) - editorHtmlIndexFile = QApplication::applicationDirPath() + "/../Resources" + editorPath; -#elif defined(Q_WS_WIN) - editorHtmlIndexFile = QApplication::applicationDirPath() + editorPath; -#else - editorHtmlIndexFile = QApplication::applicationDirPath() + editorPath; -#endif - - QUrl currentUrl = QUrl::fromLocalFile(editorHtmlIndexFile); - - if (UBSettings::settings()->webUseExternalBrowser->get().toBool()){ - QDesktopServices::openUrl(currentUrl); - } - - else { - mCurrentWebBrowser = &mWebBrowserList[Paraschool]; - mToolsCurrentPalette = &mToolsPaletteList[Paraschool]; - mToolsPalettePositionned = &mToolsPalettePositionnedList[Paraschool]; - if (!(*mCurrentWebBrowser)){ - (*mCurrentWebBrowser) = new WBBrowserWindow(mMainWindow->centralWidget(), mMainWindow, true); - connect((*mCurrentWebBrowser), SIGNAL(activeViewChange(QWidget*)), this, SLOT(setSourceWidget(QWidget*))); - - mStackedWidget->setCurrentIndex(Paraschool); - if (mStackedWidget->currentWidget()) { - mStackedWidget->removeWidget(mStackedWidget->currentWidget()); - } - mStackedWidget->insertWidget(Paraschool, (*mCurrentWebBrowser)); - - adaptToolBar(); - - mTrapFlashController = new UBTrapFlashController((*mCurrentWebBrowser)); - - connect((*mCurrentWebBrowser), SIGNAL(activeViewPageChanged()), this, SLOT(activePageChanged())); - (*mCurrentWebBrowser)->loadUrl(currentUrl); - (*mCurrentWebBrowser)->tabWidget()->tabBar()->hide(); - (*mCurrentWebBrowser)->tabWidget()->lineEdits()->hide(); - - } - - mStackedWidget->setCurrentIndex(Paraschool); - UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); - mMainWindow->switchToWebWidget(); - screenLayoutChanged(); - - bool mirroring = UBSettings::settings()->webShowPageImmediatelyOnMirroredScreen->get().toBool(); - UBApplication::mainWindow->actionWebShowHideOnDisplay->setChecked(mirroring); - } -} - - void UBWebController::show(WebInstance type) { switch(type) @@ -312,9 +255,6 @@ void UBWebController::show(WebInstance type) case Tutorial: tutorialWebInstance(); break; - case Paraschool: - paraschoolWebInstance(); - break; default: qCritical() << __FILE__ << " non supported web instance type " << QString::number(type) ; break; diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index 3f239402..15d7c7bb 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -60,7 +60,7 @@ class UBWebController : public QObject enum WebInstance { - WebBrowser = 0, Tutorial, Paraschool, TotalNumberOfWebInstances + WebBrowser = 0, Tutorial, TotalNumberOfWebInstances }; void show(WebInstance type = UBWebController::WebBrowser); @@ -108,7 +108,6 @@ class UBWebController : public QObject void initialiazemOEmbedProviders(); void tutorialWebInstance(); void webBrowserInstance(); - void paraschoolWebInstance(); void lookForEmbedContent(QString* pHtml, QString tag, QString attribute, QList* pList); void checkForOEmbed(QString* pHtml); @@ -123,8 +122,6 @@ class UBWebController : public QObject UBTrapFlashController* mTrapFlashController; UBWebToolsPalette** mToolsCurrentPalette; UBWebToolsPalette* mToolsPaletteList[TotalNumberOfWebInstances]; -// UBKeyboardPalette** mKeyboardCurrentPalette; -// UBKeyboardPalette* mKeyboardPaletteList[TotalNumberOfWebInstances]; bool mToolsPalettePositionned; bool mToolsPalettePositionnedList[TotalNumberOfWebInstances]; @@ -144,7 +141,6 @@ class UBWebController : public QObject void toggleWebTrap(bool checked); void onOEmbedParsed(QVector contents); -// void showKeyboard(bool checked); signals: /**