MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into 1.4-dev

Browse Source
preferencesAboutTextFull
Craig Watson 8 years ago
parent 2429d6660f 425129ff2f
commit 5fd617c539
20 changed files with 306 additions and 122 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      resources/etc/OpenBoard.config
  2. 130
      resources/i18n/OpenBoard_it.ts
  3. 47
      src/adaptors/UBExportPDF.cpp
  4. 5
      src/board/UBBoardController.cpp
  5. 7
      src/board/UBBoardPaletteManager.cpp
  6. 8
      src/core/UBApplication.cpp
  7. 2
      src/core/UBApplicationController.cpp
  8. 2
      src/core/UBPreferencesController.cpp
  9. 5
      src/core/UBSettings.cpp
  10. 3
      src/core/UBSettings.h
  11. 72
      src/document/UBDocumentController.cpp
  12. 3
      src/document/UBDocumentController.h
  13. 43
      src/domain/UBGraphicsItemUndoCommand.cpp
  14. 39
      src/domain/UBGraphicsMediaItem.cpp
  15. 3
      src/domain/UBGraphicsMediaItem.h
  16. 40
      src/domain/UBGraphicsScene.cpp
  17. 2
      src/domain/UBGraphicsScene.h
  18. 5
      src/domain/UBGraphicsStrokesGroup.cpp
  19. 7
      src/gui/UBDocumentTreeWidget.cpp
  20. 2
      src/tools/UBGraphicsCurtainItemDelegate.cpp

1
resources/etc/OpenBoard.config
Unescape View File

@ -1,7 +1,6 @@
[App]
AngleTolerance=4
EnableAutomaticSoftwareUpdates=false
EnableSoftwareUpdates=true
EnableStartupHints=true
FavoriteToolURIs=openboardtool://openboard/mask, openboardtool://ruler, openboardtool://compass, openboardtool://protractor, openboardtool://triangle, openboardtool://magnifier, openboardtool://cache
IsInSoftwareUpdateProcess=false

130
resources/i18n/OpenBoard_it.ts
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<TS version="2.0" language="it_IT" sourcelanguage="it_IT">
<context>
<name>BlackoutWidget</name>
<message>
@ -793,11 +793,11 @@
</message>
<message>
<source>Open Tutorial</source>
<translation type="unfinished"></translation>
<translation>Apri tutorial</translation>
</message>
<message>
<source>Open the tutorial web page</source>
<translation type="unfinished"></translation>
<translation>Apri la pagina web del tutorial</translation>
</message>
<message>
<source>Ruled Light Background</source>
@ -850,11 +850,11 @@
<name>QObject</name>
<message>
<source>Element ID = </source>
<translation type="vanished">Elemento ID =</translation>
<translation>Elemento ID =</translation>
</message>
<message>
<source>Content is not supported in destination format.</source>
<translation type="vanished">Il contenuto non è supportato nel formato di destinazione.</translation>
<translation>Il contenuto non è supportato nel formato di destinazione.</translation>
</message>
<message>
<source>Remove Page</source>
@ -954,11 +954,11 @@
</message>
<message>
<source>Saving document...</source>
<translation type="unfinished"></translation>
<translation>Salvataggio documento...</translation>
</message>
<message>
<source>Document has just been saved...</source>
<translation type="unfinished"></translation>
<translation>Il documento è stato appena salvato...</translation>
</message>
</context>
<context>
@ -1019,7 +1019,7 @@
</message>
<message>
<source>Show OpenBoard</source>
<translation type="unfinished"></translation>
<translation>Mostra OpenBoard</translation>
</message>
</context>
<context>
@ -1138,9 +1138,9 @@
</message>
<message numerus="yes">
<source>Are you sure you want to remove %n page(s) from the selected document &apos;%1&apos;?</source>
<translation type="unfinished">
<numerusform>Sei sicuro di voler rimuovere %n pagine dal documento &apos;%1&apos; selezionato?
</numerusform>
<translation>
<numerusform>Sei sicuro di voler rimuovere %n pagina dal documento &apos;%1&apos; selezionato?</numerusform>
<numerusform>Sei sicuro di voler rimuovere %n pagine dal documento &apos;%1&apos; selezionato?</numerusform>
</translation>
</message>
<message>
@ -1153,15 +1153,15 @@
</message>
<message>
<source>The document &apos;%1&apos; has been generated with a newer version of OpenBoard (%2). By opening it, you may lose some information. Do you want to proceed?</source>
<translation type="unfinished"></translation>
<translation>Il documento &quot;%1&quot; è stato generato con una più recente versione di OpenBoard (%2). Aprendolo, si possono perdere alcune informazioni. Procedere ugualmente?</translation>
</message>
<message>
<source>Are you sure you want to remove all selected documents?</source>
<translation type="unfinished"></translation>
<translation>Sicuri di voler rimuovere tutti i documenti selezionati?</translation>
</message>
<message>
<source>Remove multiple documents</source>
<translation type="unfinished"></translation>
<translation>Rimuovi documenti multipli</translation>
</message>
</context>
<context>
@ -1227,8 +1227,8 @@
<message numerus="yes">
<source>%1 pages copied</source>
<translation type="unfinished">
<numerusform>%1 pagine copiate
</numerusform>
<numerusform>%1 pagina copiata</numerusform>
<numerusform>%1 pagine copiate</numerusform>
</translation>
</message>
</context>
@ -1274,23 +1274,23 @@
<name>UBExportCFF</name>
<message>
<source>Export to IWB</source>
<translation type="vanished">Esporta in IWB</translation>
<translation>Esporta in IWB</translation>
</message>
<message>
<source>Export as IWB File</source>
<translation type="vanished">Esporta come file IWB</translation>
<translation>Esporta come file IWB</translation>
</message>
<message>
<source>Exporting document...</source>
<translation type="vanished">Esportazione documento in corso...</translation>
<translation>Esportazione documento in corso...</translation>
</message>
<message>
<source>Export successful.</source>
<translation type="vanished">Esportazione conclusa con successo.</translation>
<translation>Esportazione conclusa con successo.</translation>
</message>
<message>
<source>Export failed.</source>
<translation type="vanished">Esportazione fallita.</translation>
<translation>Esportazione fallita.</translation>
</message>
</context>
<context>
@ -1317,8 +1317,23 @@
</message>
<message>
<source>Export to OpenBoard Format</source>
<translation type="unfinished"></translation>
<translation>Esporta nel formato OpenBoard</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Export failed: location not writable</source>
<translation>Exportazione fallita: posizione non scrivibile</translation>
</message>
<message>
<source>Export failed</source>
<translation>Esportazione fallita</translation>
</message>
<message>
<source>Unable to export to the selected location. You do not have the permissions necessary to save the file.</source>
<translation>Impossibile esportare nella posizione selezionata. Non possiedi i permessi necessari a salvare il file.</translation>
</message>
>>>>>>> dev
</context>
<context>
<name>UBExportFullPDF</name>
@ -1338,6 +1353,21 @@
<source>Export to PDF</source>
<translation>Esporta in PDF</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Export failed: location not writable</source>
<translation>Esportazione fallita: posizione non scrivibile</translation>
</message>
<message>
<source>Export failed</source>
<translation>Esportazione fallita</translation>
</message>
<message>
<source>Unable to export to the selected location. You do not have the permissions necessary to save the file.</source>
<translation>Impossibile esportare alla posizione selezionata. Non possiedi i permessi necessari a salvare il file.</translation>
</message>
>>>>>>> dev
</context>
<context>
<name>UBExportPDF</name>
@ -1542,19 +1572,19 @@
<name>UBGraphicsMediaItem</name>
<message>
<source>Media resource couldn&apos;t be resolved</source>
<translation type="unfinished"></translation>
<translation>La risorsa multimediale non può essere gestita</translation>
</message>
<message>
<source>Unsupported media format</source>
<translation type="unfinished"></translation>
<translation>Formato multimediale non supportato</translation>
</message>
<message>
<source>Media playback service not found</source>
<translation type="unfinished"></translation>
<translation>Servizio di esecuzione multimediale non trovato</translation>
</message>
<message>
<source>Media error: </source>
<translation type="unfinished"></translation>
<translation>Errore multimediale: </translation>
</message>
</context>
<context>
@ -1604,23 +1634,23 @@
<name>UBImportCFF</name>
<message>
<source>Common File Format (</source>
<translation type="vanished">Common File Format (</translation>
<translation>Common File Format (</translation>
</message>
<message>
<source>Importing file %1...</source>
<translation type="vanished">Importazione del file %1 in corso...</translation>
<translation>Importazione del file %1 in corso...</translation>
</message>
<message>
<source>Import of file %1 failed.</source>
<translation type="vanished">L&apos;importazione del file %1 è fallita.</translation>
<translation>L&apos;importazione del file %1 è fallita.</translation>
</message>
<message>
<source>Import successful.</source>
<translation type="vanished">Importazione completata con successo.</translation>
<translation>Importazione completata con successo.</translation>
</message>
<message>
<source>Import failed.</source>
<translation type="vanished">Importazione fallita.</translation>
<translation>Importazione fallita.</translation>
</message>
</context>
<context>
@ -1639,7 +1669,7 @@
</message>
<message>
<source>OpenBoard (*.ubz)</source>
<translation type="unfinished"></translation>
<translation>OpenBoard (*.ubz)</translation>
</message>
</context>
<context>
@ -1750,27 +1780,27 @@ Vuoi ignorare gli errori per questo host?</translation>
<name>UBOpenSankoreImporterWidget</name>
<message>
<source>Open-Sankore Documents Detected</source>
<translation type="unfinished"></translation>
<translation>Rilevati documenti Open-Sankore</translation>
</message>
<message>
<source>Show this panel next time</source>
<translation type="unfinished"></translation>
<translation>Mostra questo pannello la prossima volta</translation>
</message>
<message>
<source>You can always access the OpenBoard Document Importer through the Preferences panel in the About tab. Warning, if you have already imported your Open-Sankore datas, you might loose your current OpenBoard documents.</source>
<translation type="unfinished"></translation>
<translation>È sempre possibile accedere all&apos;importatore di documenti OpenBoard tramite il pannello delle preferenze nella scheda delle informazioni su OpenBoard. Attenzione, se si è già importato dati Open-Sankore, è possibile perdere i documenti OpenBoard correnti.</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annulla</translation>
<translation>Annulla</translation>
</message>
<message>
<source>Proceed</source>
<translation type="unfinished"></translation>
<translation>Procedi</translation>
</message>
<message>
<source>Open-Sankoré documents are present on your computer. It is possible to import them to OpenBoard by pressing the “Proceed” button to launch the importer application.</source>
<translation type="unfinished"></translation>
<translation>Documenti Open-Sankoré sono presenti nel computer. È possibile importarli in OpenBoard premendo il pulsante “Procedi” per avviare l&apos;applicazione di importazione.</translation>
</message>
</context>
<context>
@ -1785,7 +1815,7 @@ Vuoi ignorare gli errori per questo host?</translation>
</message>
<message>
<source>has lost access to the document repository &apos;%1&apos;. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.</source>
<translation type="unfinished"></translation>
<translation>ha perso l&apos;accesso al repository documenti &quot;%1&quot;. Sfortunatamente l&apos;applicazione deve essere chiusa per evitare di rivinare i dati. Gli ultimi cambiamenti potrebbero andare persi.</translation>
</message>
</context>
<context>
@ -1871,7 +1901,7 @@ Vuoi ignorare gli errori per questo host?</translation>
</message>
<message>
<source>OpenBoard Cast</source>
<translation type="unfinished"></translation>
<translation>OpenBoard Cast</translation>
</message>
</context>
<context>
@ -1930,7 +1960,7 @@ Vuoi ignorare gli errori per questo host?</translation>
<name>UBStartupHintsPalette</name>
<message>
<source>Visible next time</source>
<translation type="unfinished"></translation>
<translation>Visibile la prossima volta</translation>
</message>
</context>
<context>
@ -2330,7 +2360,7 @@ Si prega di riavviare l&apos;applicazione per accedere ai documenti aggiornati.<
</message>
<message>
<source>Download PDF Document: would you prefer to download the PDF file or add it to the current OpenBoard document?</source>
<translation type="unfinished"></translation>
<translation>Scarica il documento PDF: preferisci scaricare il file PDF o aggiungerlo al documento OpenBoard corrente?</translation>
</message>
</context>
<context>
@ -2384,11 +2414,11 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Restore credentials on reboot</source>
<translation type="unfinished"></translation>
<translation>Ripristina le credenziali al riavvio</translation>
</message>
<message>
<source>OpenBoard</source>
<translation type="unfinished">OpenBoard</translation>
<translation>OpenBoard</translation>
</message>
</context>
<context>
@ -2461,7 +2491,7 @@ p, li { white-space: pre-wrap; }
<name>documents</name>
<message>
<source>OpenBoard Documents</source>
<translation type="unfinished"></translation>
<translation>Documenti OpenBoard</translation>
</message>
</context>
<context>
@ -2504,7 +2534,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Keyboard button size:</source>
<translation type="vanished">Dimensione pulsanti tastiera:</translation>
<translation>Dimensione pulsanti tastiera:</translation>
</message>
<message>
<source>Toolbar</source>
@ -2604,19 +2634,19 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Open-Sankoré Importer</source>
<translation type="unfinished"></translation>
<translation>Apri l&apos;importatore Open-Sankoré</translation>
</message>
<message>
<source>Check if Open-Sankoré data could be imported at launch</source>
<translation type="unfinished"></translation>
<translation>Controlla se i dati Open-Sankoré possono venir importati all&apos;avvio</translation>
</message>
<message>
<source>Use system keyboard (recommended)</source>
<translation type="unfinished"></translation>
<translation>Usa la tastiera di sistema (raccomandato)</translation>
</message>
<message>
<source>Built-in virtual keyboard button size:</source>
<translation type="unfinished"></translation>
<translation>Dimensione pulsanti tastiera virtuale incorporata:</translation>
</message>
</context>
<context>

47
src/adaptors/UBExportPDF.cpp
Unescape View File

@ -32,6 +32,7 @@
#include <QtCore>
#include <QtSvg>
#include <QPrinter>
#include <QPdfWriter>
#include "core/UBApplication.h"
#include "core/UBSettings.h"
@ -40,6 +41,7 @@
#include "domain/UBGraphicsScene.h"
#include "domain/UBGraphicsSvgItem.h"
#include "domain/UBGraphicsPDFItem.h"
#include "document/UBDocumentProxy.h"
@ -66,14 +68,14 @@ void UBExportPDF::persist(UBDocumentProxy* pDocumentProxy)
bool UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QString& filename)
{
QPrinter pdfPrinter;
QPdfWriter pdfWriter(filename);
qDebug() << "exporting document to PDF" << filename;
pdfPrinter.setOutputFormat(QPrinter::PdfFormat);
pdfPrinter.setResolution(UBSettings::settings()->pdfResolution->get().toInt());
pdfPrinter.setOutputFileName(filename);
pdfPrinter.setFullPage(true);
pdfWriter.setResolution(UBSettings::settings()->pdfResolution->get().toInt());
pdfWriter.setPageMargins(QMarginsF());
pdfWriter.setTitle(pDocumentProxy->name());
pdfWriter.setCreator("OpenBoard PDF export");
//need to calculate screen resolution
QDesktopWidget* desktop = UBApplication::desktop();
@ -85,37 +87,48 @@ bool UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QStrin
int existingPageCount = pDocumentProxy->pageCount();
for(int pageIndex = 0 ; pageIndex < existingPageCount; pageIndex++)
{
for(int pageIndex = 0 ; pageIndex < existingPageCount; pageIndex++) {
UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->loadDocumentScene(pDocumentProxy, pageIndex);
UBApplication::showMessage(tr("Exporting page %1 of %2").arg(pageIndex + 1).arg(existingPageCount));
// set background to white, no crossing for PDF output
bool isDark = scene->isDarkBackground();
UBPageBackground pageBackground = scene->pageBackground();
scene->setBackground(false, UBPageBackground::plain);
QSize pageSize = scene->nominalSize();
// pageSize is the output PDF page size; it is set to equal the scene's boundary size; if the contents
// of the scene overflow from the boundaries, they will be scaled down.
QSize pageSize = scene->sceneSize();
// set high res rendering
scene->setRenderingQuality(UBItem::RenderingQualityHigh);
scene->setRenderingContext(UBGraphicsScene::NonScreen);
//setting page size to appropriate value
pdfPrinter.setPaperSize(QSizeF(pageSize.width()*scaleFactor, pageSize.height()*scaleFactor), QPrinter::Point);
if(painterNeedsBegin) painterNeedsBegin = !pdfPainter.begin(&pdfPrinter);
//render to PDF
scene->render(&pdfPainter, QRectF(), scene->normalizedSceneRect());
// Setting output page size
QPageSize outputPageSize = QPageSize(QSizeF(pageSize.width()*scaleFactor, pageSize.height()*scaleFactor), QPageSize::Point);
pdfWriter.setPageSize(outputPageSize);
// Call begin only once
if(painterNeedsBegin)
painterNeedsBegin = !pdfPainter.begin(&pdfWriter);
if (pageIndex < existingPageCount - 1) pdfPrinter.newPage();
else if (pageIndex < existingPageCount)
pdfWriter.newPage();
//restore screen rendering quality
// Render the scene
scene->render(&pdfPainter, QRectF(), scene->normalizedSceneRect());
// Restore screen rendering quality
scene->setRenderingContext(UBGraphicsScene::Screen);
scene->setRenderingQuality(UBItem::RenderingQualityNormal);
//restore background state
// Restore background state
scene->setBackground(isDark, pageBackground);
}
if(!painterNeedsBegin) pdfPainter.end();
if(!painterNeedsBegin)
pdfPainter.end();
return true;
}

5
src/board/UBBoardController.cpp
Unescape View File

@ -620,9 +620,6 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
itemSize = commonItem->boundingRect().size();
commonItem->setSelected(false);
UBGraphicsStrokesGroup *stroke = dynamic_cast<UBGraphicsStrokesGroup*>(commonItem);
if (stroke)
itemPos = QPointF(shifting, shifting);
}
UBMimeType::Enum itemMimeType;
@ -681,7 +678,7 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
{
QBuffer buffer(&pData);
buffer.open(QIODevice::WriteOnly);
QString format = UBFileSystemUtils::extension(item->sourceUrl().toLocalFile());
QString format = UBFileSystemUtils::extension(item->sourceUrl().toString(QUrl::DecodeReserved));
pixitem->pixmap().save(&buffer, format.toLatin1());
}
}break;

7
src/board/UBBoardPaletteManager.cpp
Unescape View File

@ -74,6 +74,7 @@
#include "document/UBDocumentController.h"
#include "core/UBPersistenceManager.h"
#include "core/memcheck.h"
UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardController* pBoardController)
@ -862,7 +863,11 @@ void UBBoardPaletteManager::addItemToCurrentPage()
{
UBGraphicsPixmapItem* item = UBApplication::boardController->activeScene()->addPixmap(mPixmap, NULL, mPos, mScaleFactor);
item->setSourceUrl(mItemUrl);
QString documentPath = UBApplication::boardController->selectedDocument()->persistencePath();
QString fileName = UBPersistenceManager::imageDirectory + "/" + item->uuid().toString() + ".png";
QString path = documentPath + "/" + fileName;
item->setSourceUrl(QUrl(path));
item->setSelected(true);
UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);

8
src/core/UBApplication.cpp
Unescape View File

@ -511,13 +511,7 @@ void UBApplication::decorateActionMenu(QAction* action)
menu->addSeparator();
menu->addAction(mainWindow->actionPreferences);
menu->addAction(mainWindow->actionMultiScreen);
// SANKORE-48: Hide the check update action if the setting
// EnableAutomaticSoftwareUpdates is false in Uniboard.config
if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool())
menu->addAction(mainWindow->actionCheckUpdate);
else
mainWindow->actionCheckUpdate->setEnabled(false);
menu->addAction(mainWindow->actionCheckUpdate);
menu->addSeparator();
menu->addAction(mainWindow->actionPodcast);

2
src/core/UBApplicationController.cpp
Unescape View File

@ -479,7 +479,7 @@ void UBApplicationController::checkUpdate(const QUrl& url)
{
QUrl jsonUrl = url;
if (url.isEmpty())
jsonUrl = UBSettings::settings()->appSoftwareUpdateURI->get().toUrl();
jsonUrl = UBSettings::settings()->appSoftwareUpdateURL->get().toUrl();
qDebug() << "Checking for update at url: " << jsonUrl.toString();

2
src/core/UBPreferencesController.cpp
Unescape View File

@ -190,8 +190,6 @@ void UBPreferencesController::wire()
// about tab
connect(mPreferencesUI->checkSoftwareUpdateAtLaunchCheckBox, SIGNAL(clicked(bool)), settings->appEnableAutomaticSoftwareUpdates, SLOT(setBool(bool)));
// As we (hopefully temporarily) don't have a website to check updates at, this setting is hidden for now
mPreferencesUI->softwareUpdateGroupBox->setVisible(false);
connect(mPreferencesUI->checkOpenSankoreAtStartup, SIGNAL(clicked(bool)), settings->appLookForOpenSankoreInstall, SLOT(setBool(bool)));
}

5
src/core/UBSettings.cpp
Unescape View File

@ -227,8 +227,7 @@ void UBSettings::init()
appToolBarPositionedAtTop = new UBSetting(this, "App", "ToolBarPositionedAtTop", true);
appToolBarDisplayText = new UBSetting(this, "App", "ToolBarDisplayText", true);
appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", false);
appEnableSoftwareUpdates = new UBSetting(this, "App", "EnableSoftwareUpdates", true);
appSoftwareUpdateURI = new UBSetting(this, "App", "SoftwareUpdateURI", "http://www.openboard.ch/update.json");
appSoftwareUpdateURL = new UBSetting(this, "App", "SoftwareUpdateURL", "http://www.openboard.ch/update.json");
appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
appPreferredLanguage = new UBSetting(this,"App","PreferredLanguage", "");
@ -281,7 +280,7 @@ void UBSettings::init()
pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3));
boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C82C2C2C");
boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C8C0C0C0");
boardCrossColorLightBackground = new UBSetting(this, "Board", "CrossColorLightBackground", "#A5E1FF");
QStringList penLightBackgroundColors;

3
src/core/UBSettings.h
Unescape View File

@ -243,8 +243,7 @@ class UBSettings : public QObject
UBSetting* appToolBarPositionedAtTop;
UBSetting* appToolBarDisplayText;
UBSetting* appEnableAutomaticSoftwareUpdates;
UBSetting* appEnableSoftwareUpdates;
UBSetting* appSoftwareUpdateURI;
UBSetting* appSoftwareUpdateURL;
UBSetting* appToolBarOrientationVertical;
UBSetting* appPreferredLanguage;

72
src/document/UBDocumentController.cpp
Unescape View File

@ -546,37 +546,66 @@ void UBDocumentController::duplicateSelectedItem()
}
/**
* @brief When deleting multiple documents, find a new document and select it
* @brief Set the first document in the list as current document
*
* This method simply selects the first un-selected document
* If there are no documents, a new one is created.
*/
void UBDocumentController::selectADocumentOnMultipleTrashing()
void UBDocumentController::selectFirstDocumentInList()
{
// Loop through all folders, and each document in those folders, until we find
// a document that is not in the current selection (which is being deleted)
// Loop through all folders until we find one that is not the trash and not empty,
// and select the first document in that folder
for (int i(0); i < mDocumentUI->documentTreeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem* item = mDocumentUI->documentTreeWidget->topLevelItem(i);
UBDocumentGroupTreeItem* groupItem = dynamic_cast<UBDocumentGroupTreeItem*>(item);
if (!groupItem->isTrashFolder()) {
for (int j(0); j < groupItem->childCount(); ++j) {
if (!mCurrentSelection.contains( groupItem->child(j) )) {
selectDocument(((UBDocumentProxyTreeItem*)groupItem->child(j))->proxy(), true);
return;
}
}
if (!groupItem->isTrashFolder() && groupItem->childCount() > 0) {
selectDocument(((UBDocumentProxyTreeItem*)groupItem->child(0))->proxy(), true);
groupItem->child(0)->setSelected(true);
return;
}
}
// No document found => create a new one
UBDocumentGroupTreeItem* topFolder = dynamic_cast<UBDocumentGroupTreeItem*>(mDocumentUI->documentTreeWidget->topLevelItem(0));
UBDocumentProxy* document = UBPersistenceManager::persistenceManager()->createDocument(topFolder->groupName());
selectDocument(document, true);
}
/**
* @brief Find the current document, and select it in the list
*
* If selectNewCurrentDocument is true, the first document in the list is selected and set as
* current document.
*/
void UBDocumentController::selectATreeItemOnMultipleTrashing(bool selectNewCurrentDocument)
{
mCurrentSelection.clear();
if (selectNewCurrentDocument) {
selectFirstDocumentInList();
return;
}
// Find the currently selected document, and select its corresponding tree item
// If it isn't found, then the first document in the list is selected and set as current document
for (int i(0); i < mDocumentUI->documentTreeWidget->topLevelItemCount(); i++) {
QTreeWidgetItem* item = mDocumentUI->documentTreeWidget->topLevelItem(i);
UBDocumentGroupTreeItem* groupItem = dynamic_cast<UBDocumentGroupTreeItem*>(item);
if (!groupItem->isTrashFolder()) {
for (int j(0); j < groupItem->childCount(); j++) {
if (((UBDocumentProxyTreeItem*)groupItem->child(j))->proxy() == mBoardController->selectedDocument()) {
((UBDocumentProxyTreeItem*)groupItem->child(j))->setSelected(true);
return;
}
}
}
}
selectFirstDocumentInList();
}
void UBDocumentController::selectADocumentOnTrashingSelectedOne(UBDocumentGroupTreeItem* groupTi,UBDocumentProxyTreeItem *proxyTi)
@ -807,9 +836,9 @@ void UBDocumentController::deleteTreeItem(QTreeWidgetItem * item, bool showConfi
if (selectNewDocument) {
if (mTrashTi->childCount()==0)
selectDocument(NULL);
selectATreeItemOnMultipleTrashing(false);
else
selectDocument(((UBDocumentProxyTreeItem*)mTrashTi->child(0))->proxy());
selectDocument(((UBDocumentProxyTreeItem*)mTrashTi->child(0))->proxy(), false);
}
reloadThumbnails();
@ -849,11 +878,18 @@ void UBDocumentController::deleteSelectedItem()
QList<QTreeWidgetItem*> foldersToDelete;
bool currentDocumentDeleted = false;
foreach (QTreeWidgetItem * item, mCurrentSelection) {
LastSelectedElementType type = itemType(item);
if (type == Document)
if (type == Document) {
deleteTreeItem(item, false, false);
UBDocumentProxyTreeItem* proxyItem = dynamic_cast<UBDocumentProxyTreeItem*>(item);
if (proxyItem && proxyItem->proxy() && (proxyItem->proxy() == mBoardController->selectedDocument()))
currentDocumentDeleted = true;
}
else if (type == Folder)
// Delete folders later, to avoid deleting a document twice
foldersToDelete << item;
@ -863,7 +899,7 @@ void UBDocumentController::deleteSelectedItem()
deleteTreeItem(item, false, false);
}
selectADocumentOnMultipleTrashing();
selectATreeItemOnMultipleTrashing(currentDocumentDeleted);
}
else if (mSelectionType == Document || mSelectionType == Folder) {

3
src/document/UBDocumentController.h
Unescape View File

@ -130,7 +130,8 @@ class UBDocumentController : public UBDocumentContainer
QString mDefaultDocumentGroupName;
void selectADocumentOnTrashingSelectedOne(UBDocumentGroupTreeItem* groupTi,UBDocumentProxyTreeItem *proxyTi);
void selectADocumentOnMultipleTrashing();
void selectFirstDocumentInList();
void selectATreeItemOnMultipleTrashing(bool selectNewCurrentDocument = false);
void moveDocumentToTrash(UBDocumentGroupTreeItem* groupTi, UBDocumentProxyTreeItem *proxyTi, bool selectNewDocument);
void moveFolderToTrash(UBDocumentGroupTreeItem* groupTi);
void emptyTrash(bool showConfirmationDialog);

43
src/domain/UBGraphicsItemUndoCommand.cpp
Unescape View File

@ -98,7 +98,28 @@ void UBGraphicsItemUndoCommand::undo()
UBApplication::boardController->freezeW3CWidget(item, true);
item->setSelected(false);
QTransform t;
bool bApplyTransform = false;
UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
if (polygonItem){
if (polygonItem->strokesGroup()
&& polygonItem->strokesGroup()->parentItem()
&& UBGraphicsGroupContainerItem::Type == polygonItem->strokesGroup()->parentItem()->type())
{
bApplyTransform = true;
t = polygonItem->sceneTransform();
}
else if (polygonItem->strokesGroup())
polygonItem->resetTransform();
polygonItem->strokesGroup()->removeFromGroup(polygonItem);
}
mScene->removeItem(item);
if (bApplyTransform)
polygonItem->setTransform(t);
}
QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
@ -207,7 +228,29 @@ void UBGraphicsItemUndoCommand::redo()
{
QGraphicsItem* item = itRemoved.next();
item->setSelected(false);
QTransform t;
bool bApplyTransform = false;
UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
if (polygonItem){
if(polygonItem->strokesGroup()
&& polygonItem->strokesGroup()->parentItem()
&& UBGraphicsGroupContainerItem::Type == polygonItem->strokesGroup()->parentItem()->type())
{
bApplyTransform = true;
t = polygonItem->sceneTransform();
}
else if (polygonItem->strokesGroup())
polygonItem->resetTransform();
polygonItem->strokesGroup()->removeFromGroup(polygonItem);
}
mScene->removeItem(item);
if (bApplyTransform)
item->setTransform(t);
UBApplication::boardController->freezeW3CWidget(item, true);
}

39
src/domain/UBGraphicsMediaItem.cpp
Unescape View File

@ -130,7 +130,14 @@ UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl &pMediaFileUrl, QGraphicsIte
mVideoItem->setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
mVideoItem->setFlag(ItemStacksBehindParent, true);
mMediaObject->setVideoOutput(mVideoItem);
/* setVideoOutput has to be called only when the video item is visible on the screen,
* due to a Qt bug (QTBUG-32522). So instead of calling it here, it is called when the
* active scene has changed, or when the item is first created.
* If and when Qt fix this issue, this should be changed back.
* */
//mMediaObject->setVideoOutput(mVideoItem);
mHasVideoOutput = false;
mMediaObject->setNotifyInterval(50);
setMinimumSize(QSize(320, 240));
@ -155,8 +162,10 @@ UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl &pMediaFileUrl, QGraphicsIte
UBGraphicsMediaItem::~UBGraphicsMediaItem()
{
if (mMediaObject)
if (mMediaObject) {
mMediaObject->stop();
delete mMediaObject;
}
}
QVariant UBGraphicsMediaItem::itemChange(GraphicsItemChange change, const QVariant &value)
@ -569,6 +578,22 @@ void UBGraphicsVideoItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
}
QVariant UBGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value) {
if (change == QGraphicsItem::ItemVisibleChange
&& value.toBool()
&& !mHasVideoOutput
&& UBApplication::app()->boardController
&& UBApplication::app()->boardController->activeScene() == scene())
{
//qDebug() << "Item change, setting video output";
mMediaObject->setVideoOutput(mVideoItem);
mHasVideoOutput = true;
}
return UBGraphicsMediaItem::itemChange(change, value);
}
void UBGraphicsVideoItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
// Display the seek bar
@ -610,9 +635,19 @@ void UBGraphicsVideoItem::mediaStateChanged(QMediaPlayer::State state)
void UBGraphicsVideoItem::activeSceneChanged()
{
//qDebug() << "Active scene changed";
// Update the visibility of the placeholder, to prevent it being hidden when switching pages
setPlaceholderVisible(!mErrorString.isEmpty());
// Call setVideoOutput, if the video is visible and if it hasn't been called already
if (!mHasVideoOutput && UBApplication::boardController->activeScene() == scene()) {
//qDebug() << "setting video output";
mMediaObject->setMedia(mMediaFileUrl);
mMediaObject->setVideoOutput(mVideoItem);
mHasVideoOutput = true;
}
UBGraphicsMediaItem::activeSceneChanged();
}

3
src/domain/UBGraphicsMediaItem.h
Unescape View File

@ -207,11 +207,14 @@ protected:
QGraphicsVideoItem *mVideoItem;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void setPlaceholderVisible(bool visible);
bool mHasVideoOutput;
};

40
src/domain/UBGraphicsScene.cpp
Unescape View File

@ -2336,15 +2336,19 @@ QList<QUrl> UBGraphicsScene::relativeDependencies() const
while (itItems.hasNext())
{
QGraphicsItem* item = itItems.next();
UBGraphicsMediaItem *mediaItem = qgraphicsitem_cast<UBGraphicsMediaItem*> (item);
if (mediaItem){
QString completeFileName = QFileInfo(mediaItem->mediaFileUrl().toLocalFile()).fileName();
QString path;
if(mediaItem->getMediaType() == UBGraphicsMediaItem::mediaType_Video)
path = UBPersistenceManager::videoDirectory + "/";
else
path = UBPersistenceManager::audioDirectory + "/";
UBGraphicsVideoItem *videoItem = qgraphicsitem_cast<UBGraphicsVideoItem*> (item);
if (videoItem){
QString completeFileName = QFileInfo(videoItem->mediaFileUrl().toLocalFile()).fileName();
QString path = UBPersistenceManager::videoDirectory + "/";
relativePathes << QUrl(path + completeFileName);
continue;
}
UBGraphicsAudioItem *audioItem = qgraphicsitem_cast<UBGraphicsAudioItem*> (item);
if (audioItem){
QString completeFileName = QFileInfo(audioItem->mediaFileUrl().toLocalFile()).fileName();
QString path = UBPersistenceManager::audioDirectory + "/";
relativePathes << QUrl(path + completeFileName);
continue;
}
@ -2384,6 +2388,24 @@ QSize UBGraphicsScene::nominalSize()
return mNominalSize;
}
/**
* @brief Return the scene's boundary size, including any background item
*
* If no background item is present, this returns nominalSize()
*/
QSize UBGraphicsScene::sceneSize()
{
UBGraphicsPDFItem *pdfItem = qgraphicsitem_cast<UBGraphicsPDFItem*>(backgroundObject());
if (pdfItem) {
QRectF targetRect = pdfItem->sceneBoundingRect();
return targetRect.size().toSize();
}
else
return nominalSize();
}
void UBGraphicsScene::setNominalSize(const QSize& pSize)
{
if (nominalSize() != pSize)

2
src/domain/UBGraphicsScene.h
Unescape View File

@ -286,6 +286,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
QSize nominalSize();
QSize sceneSize();
void setNominalSize(const QSize& pSize);
void setNominalSize(int pWidth, int pHeight);

5
src/domain/UBGraphicsStrokesGroup.cpp
Unescape View File

@ -148,12 +148,15 @@ void UBGraphicsStrokesGroup::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
UBItem* UBGraphicsStrokesGroup::deepCopy() const
{
QTransform groupTransform = transform();
QPointF groupPos = pos();
UBGraphicsStrokesGroup* copy = new UBGraphicsStrokesGroup();
copyItemParameters(copy);
copy->resetTransform();
copy->setPos(0,0);
const_cast<UBGraphicsStrokesGroup*>(this)->resetTransform();
const_cast<UBGraphicsStrokesGroup*>(this)->setPos(0,0);
QList<QGraphicsItem*> chl = childItems();
@ -175,7 +178,9 @@ UBItem* UBGraphicsStrokesGroup::deepCopy() const
}
}
const_cast<UBGraphicsStrokesGroup*>(this)->setTransform(groupTransform);
const_cast<UBGraphicsStrokesGroup*>(this)->setPos(groupPos);
copy->setTransform(groupTransform);
copy->setPos(groupPos);
return copy;
}

7
src/gui/UBDocumentTreeWidget.cpp
Unescape View File

@ -285,13 +285,16 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event)
QString source = scene->document()->persistencePath() + "/" + relativeFile.toString();
QString target = targetDocProxy->persistencePath() + "/" + relativeFile.toString();
QString sourceDecoded = scene->document()->persistencePath() + "/" + relativeFile.toString(QUrl::DecodeReserved);
QString targetDecoded = targetDocProxy->persistencePath() + "/" + relativeFile.toString(QUrl::DecodeReserved);
if(QFileInfo(source).isDir())
UBFileSystemUtils::copyDir(source,target);
else{
QFileInfo fi(target);
QFileInfo fi(targetDecoded);
QDir d = fi.dir();
d.mkpath(d.absolutePath());
QFile::copy(source, target);
QFile::copy(sourceDecoded, targetDecoded);
}
}

2
src/tools/UBGraphicsCurtainItemDelegate.cpp
Unescape View File

@ -38,7 +38,7 @@
#include "core/memcheck.h"
UBGraphicsCurtainItemDelegate::UBGraphicsCurtainItemDelegate(UBGraphicsCurtainItem* pDelegated, QObject * parent)
: UBGraphicsItemDelegate(pDelegated, parent, GF_SCALABLE_ALL_AXIS | GF_MENU_SPECIFIED)
: UBGraphicsItemDelegate(pDelegated, parent, GF_MENU_SPECIFIED)
{
//NOOP
}

Write Preview
Loading…
Cancel
Save