Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor and fix DnD in Document mode #1199

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
![GitHub Repo forks](https://img.shields.io/github/forks/OpenBoard-org/openboard)
# OpenBoard
[![latest release](https://img.shields.io/github/v/release/OpenBoard-org/openboard.svg)]()
[![Commits since last release](https://img.shields.io/github/commits-since/OpenBoard-org/openboard/v1.7.2/dev)]()
[![Commits since last release](https://img.shields.io/github/commits-since/OpenBoard-org/openboard/v1.7.3/dev)]()
[![Github Repo Contributors](https://img.shields.io/github/contributors/OpenBoard-org/openboard.svg)]()
[![downloads v1.7.2](https://img.shields.io/github/downloads/OpenBoard-org/openboard/v1.7.2/total)]()
[![downloads v1.7.3](https://img.shields.io/github/downloads/OpenBoard-org/openboard/v1.7.3/total)]()
[![Github All Releases](https://img.shields.io/github/downloads/OpenBoard-org/OpenBoard/total.svg)]()

OpenBoard is an open source cross-platform interactive white board application designed primarily for use in schools. It was originally forked from Open-Sankoré, which was itself based on Uniboard.

### Installing
1.7.2 installers are available for Windows, macOS and Debian on the [Download's page](https://github.com/OpenBoard-org/OpenBoard/wiki/Downloads).
1.7.3 installers are available for Windows, macOS and Debian on the [Download's page](https://github.com/OpenBoard-org/OpenBoard/wiki/Downloads).

### Supported platforms

| Version | officially maintained platforms | branch |
|------------|--------------------------------------------------------|----|
| 1.7.2 (latest stable) | Windows 10+, macOS 12+ (for both `x64_64` and `arm64`), Debian 12 | `master` |
| 1.7.3 (active development) | Windows 10+, macOS 12+ (for both `x64_64` and `arm64`), Debian 12 | `dev` |
| 1.7.3 (latest stable) | Windows 10+, macOS 12+ (for both `x64_64` and `arm64`), Debian 12 | `master` |
| 1.7.4 (active development) | Windows 10+, macOS 12+ (for both `x64_64` and `arm64`), Debian 12 | `dev` |

### Communnity-driven packages
On Linux, Debian is the only officially maintained platform. For other platforms, you can thank the awesome community of OpenBoard that provides community-driven packages on a number of other distributions. Check on [this page](https://github.com/OpenBoard-org/OpenBoard/wiki/Downloads) to see if you find what you're looking for. If you actually want to provide support and to be referenced on this page, please open an issue with the relevant information, and we'll be glad to add your contribution.
Expand Down
12 changes: 2 additions & 10 deletions src/adaptors/UBExportDocumentSetAdaptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

#include "globals/UBGlobals.h"
#include "core/UBPersistenceManager.h"
#include "core/UBForeignObjectsHandler.h"

#ifdef Q_OS_OSX
#include <quazip.h>
Expand Down Expand Up @@ -164,16 +163,9 @@ bool UBExportDocumentSetAdaptor::addDocumentToZip(const QModelIndex &pIndex, UBD
}

std::shared_ptr<UBDocumentProxy>pDocumentProxy = model->proxyForIndex(parentIndex);
if (pDocumentProxy) {

// Q_ASSERT(QFileInfo(pDocumentProxy->persistencePath()).exists());
// UBForeighnObjectsHandler cleaner;
// cleaner.cure(pDocumentProxy->persistencePath());

//UniboardSankoreTransition document;
if (pDocumentProxy)
{
QString documentPath(pDocumentProxy->persistencePath());
//document.checkDocumentDirectory(documentPath);

QDir documentDir = QDir(pDocumentProxy->persistencePath());
QuaZipFile zipFile(&zip);
UBFileSystemUtils::compressDirInZip(documentDir, QFileInfo(documentPath).fileName() + "/", &zipFile, false);
Expand Down
2 changes: 0 additions & 2 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ target_sources(${PROJECT_NAME} PRIVATE
UBDownloadManager.h
UBDownloadThread.cpp
UBDownloadThread.h
UBForeignObjectsHandler.cpp
UBForeignObjectsHandler.h
UBIdleTimer.cpp
UBIdleTimer.h
UBMimeData.cpp
Expand Down
Loading