diff --git a/release_scripts/linux/package.sh b/release_scripts/linux/package.sh index 7837431e..a2b4bd3a 100755 --- a/release_scripts/linux/package.sh +++ b/release_scripts/linux/package.sh @@ -181,6 +181,7 @@ chown -R root:root $PACKAGE_DIRECTORY cp -R resources/customizations $PACKAGE_DIRECTORY/ cp resources/linux/openboard-ubz.xml $PACKAGE_DIRECTORY/etc/ +cp resources/linux/openboard-ubx.xml $PACKAGE_DIRECTORY/etc/ if $BUNDLE_QT; then cp -R resources/linux/run.sh $PACKAGE_DIRECTORY/ @@ -284,6 +285,7 @@ cat > "$BASE_WORKING_DIR/DEBIAN/postinst" << EOF xdg-desktop-menu install --novendor /usr/share/applications/${APPLICATION_CODE}.desktop xdg-mime install --mode system /$APPLICATION_PATH/$APPLICATION_CODE/etc/openboard-ubz.xml +xdg-mime install --mode system /$APPLICATION_PATH/$APPLICATION_CODE/etc/openboard-ubx.xml xdg-mime default /usr/share/applications/${APPLICATION_CODE}.desktop application/ubz ln -s $SYMLINK_TARGET /usr/bin/$APPLICATION_CODE diff --git a/resources/linux/openboard-ubx.xml b/resources/linux/openboard-ubx.xml new file mode 100644 index 00000000..fef89461 --- /dev/null +++ b/resources/linux/openboard-ubx.xml @@ -0,0 +1,8 @@ + + + + OpenBoard documents set + Ensemble de documents OpenBoard + + + diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 194ea6e4..cbbb2baa 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -349,7 +349,12 @@ int UBApplication::exec(const QString& pFileToImport) boardController->setupLayout(); if (pFileToImport.length() > 0) - UBApplication::applicationController->importFile(pFileToImport); + { + if (pFileToImport.endsWith(".ubx")) + UBApplication::applicationController->importUbx(pFileToImport); + else + UBApplication::applicationController->importFile(pFileToImport); + } if (UBSettings::settings()->appStartMode->get().toInt()) applicationController->showDesktop(); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 38a4f5b3..143b84f3 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -675,7 +675,6 @@ void UBApplicationController::showMessage(const QString& message, bool showSpinn } } - void UBApplicationController::importFile(const QString& pFilePath) { const QFile fileToOpen(pFilePath); @@ -709,6 +708,26 @@ void UBApplicationController::importFile(const QString& pFilePath) } } +void UBApplicationController::importUbx(const QString& pFilePath) +{ + bool success = false; + + QFileInfoList list = UBDocumentManager::documentManager()->importUbx(pFilePath, UBSettings::userDocumentDirectory()); + + success = (list.length() != 0); + + if (success) + { + if (mMainMode == Board || mMainMode == Internet) + { + if (UBApplication::boardController) + { + showBoard(); + } + } + } +} + void UBApplicationController::useMultiScreen(bool use) { if (use && !mMirror) diff --git a/src/core/UBApplicationController.h b/src/core/UBApplicationController.h index d36bae1f..23fbdfc6 100644 --- a/src/core/UBApplicationController.h +++ b/src/core/UBApplicationController.h @@ -93,6 +93,7 @@ class UBApplicationController : public QObject void showMessage(const QString& message, bool showSpinningWheel); void importFile(const QString& pFilePath); + void importUbx(const QString& pFilePath); UBDisplayManager* displayManager() {