From 6b62d3bb0b884692b995dc409ac957ea71173e33 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 2 Aug 2012 17:13:09 +0200 Subject: [PATCH 01/16] some cosmetics for windows too --- release.win7.vc9.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index b9a7fbf9..1e704303 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -1,3 +1,4 @@ +echo off REM -------------------------------------------------------------------- REM This program is free software: you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by @@ -39,10 +40,9 @@ REM pick up dll from this directory IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR rmdir /S /Q %BUILD_DIR% +rmdir /S /Q install -set EDITION=MNEMIS_EDITION - -"%QT_BIN%\qmake.exe" Sankore_3.1.pro "DEFINES+=%EDITION%" +"%QT_BIN%\qmake.exe" Sankore_3.1.pro %LRELEASE% Sankore_3.1.pro %LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro @@ -61,14 +61,13 @@ REM echo %VERSION% REM echo %LAST_TAG_VERSION% nmake release-install +IF NOT EXIST build\win32\release\product\Open-Sankore.exe GOTO EXIT_WITH_ERROR set CUSTOMIZATIONS=build\win32\release\product\customizations mkdir %CUSTOMIZATIONS% xcopy /s resources\customizations %CUSTOMIZATIONS% set I18n=build\win32\release\product\i18n -mkdir %I18n% -xcopy /s resources\i18n\*.qm %I18n% xcopy /s %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm %I18n%\ del build\win32\release\product\i18n\qt_help* From 1232807ad10de92eb1808a19b26974f132b43920 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 23 Aug 2012 12:33:26 +0200 Subject: [PATCH 02/16] fixed issue with dnd on mac from teacher guide to board --- src/board/UBBoardController.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index a1fbd435..2474e755 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -957,6 +957,9 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri // In some cases "image/jpeg;charset=" is retourned by the drag-n-drop. That is // why we will check if an ; exists and take the first part (the standard allows this kind of mimetype) + if(mimeType.isEmpty()) + mimeType = UBFileSystemUtils::mimeTypeFromFileName(sourceUrl.toString()); + int position=mimeType.indexOf(";"); if(position != -1) mimeType=mimeType.left(position); @@ -977,9 +980,18 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri qDebug() << "accepting mime type" << mimeType << "as raster image"; - QImage img; - img.loadFromData(pData); - QPixmap pix = QPixmap::fromImage(img); + + QPixmap pix; + if(pData.length() == 0){ + pix.load(sourceUrl.toString()); + } + else{ + QImage img; + img.loadFromData(pData); + pix = QPixmap::fromImage(img); + } + + UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, NULL, pPos, 1.); pixItem->setSourceUrl(sourceUrl); From 572bb698797ac526cd128152be5514a0fa28a6c0 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 23 Aug 2012 13:59:25 +0200 Subject: [PATCH 03/16] fixed issue on dnd of media and audio to the board --- src/board/UBBoardController.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 2474e755..1fe4b154 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -913,7 +913,7 @@ void UBBoardController::downloadURL(const QUrl& url, const QPointF& pPos, const else if (sUrl.startsWith("file://") || sUrl.startsWith("/")) { QString fileName = url.toLocalFile(); - + QUrl formedUrl = sUrl.startsWith("file://") ? sUrl : QUrl::fromLocalFile(sUrl); QString contentType = UBFileSystemUtils::mimeTypeFromFileName(fileName); bool shouldLoadFileData = @@ -926,7 +926,7 @@ void UBBoardController::downloadURL(const QUrl& url, const QPointF& pPos, const if (shouldLoadFileData) file.open(QIODevice::ReadOnly); - downloadFinished(true, url, contentType, file.readAll(), pPos, pSize, isBackground, internalData); + downloadFinished(true, formedUrl, contentType, file.readAll(), pPos, pSize, isBackground, internalData); if (shouldLoadFileData) file.close(); @@ -955,6 +955,8 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri { QString mimeType = pContentTypeHeader; + qDebug() << sourceUrl.toString(); + // In some cases "image/jpeg;charset=" is retourned by the drag-n-drop. That is // why we will check if an ; exists and take the first part (the standard allows this kind of mimetype) if(mimeType.isEmpty()) @@ -1948,7 +1950,7 @@ UBGraphicsMediaItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool st QString destFile; bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(selectedDocument(), - pSourceUrl.toLocalFile(), + pSourceUrl.toLocalFile(), UBPersistenceManager::videoDirectory, uuid, destFile); From 5d0464ea80bf601dcd34adca3c38dc5e94daa7ab Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 23 Aug 2012 14:13:45 +0200 Subject: [PATCH 04/16] fixed issue of widget that doesn't follow the scroll area on the presentation widget --- src/board/UBBoardController.cpp | 6 +----- src/gui/UBTeacherGuideWidget.cpp | 12 ++++++++++++ src/gui/UBTeacherGuideWidget.h | 6 ++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 1fe4b154..2ef4cedf 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -955,8 +955,6 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri { QString mimeType = pContentTypeHeader; - qDebug() << sourceUrl.toString(); - // In some cases "image/jpeg;charset=" is retourned by the drag-n-drop. That is // why we will check if an ; exists and take the first part (the standard allows this kind of mimetype) if(mimeType.isEmpty()) @@ -985,7 +983,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri QPixmap pix; if(pData.length() == 0){ - pix.load(sourceUrl.toString()); + pix.load(sourceUrl.toLocalFile()); } else{ QImage img; @@ -993,8 +991,6 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri pix = QPixmap::fromImage(img); } - - UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, NULL, pPos, 1.); pixItem->setSourceUrl(sourceUrl); diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 5322919a..666c64e0 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -468,6 +468,10 @@ UBTeacherGuidePresentationWidget::UBTeacherGuidePresentationWidget(QWidget *pare mpTreeWidget->setIconSize(QSize(24,24)); connect(mpTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(onAddItemClicked(QTreeWidgetItem*,int))); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(onActiveSceneChanged())); +#ifdef Q_WS_MAC + // on mac and with the custom qt the widget on the tree are not automatically relocated when using the vertical scrollbar. To relocate them we link the valueChange signal of the vertical scrollbar witht a local signal to trig a change and a repaint of the tree widget + connect(mpTreeWidget->verticalScrollBar(),SIGNAL(valueChanged(int)),this,SLOT(onSliderMoved(int))); +#endif } UBTeacherGuidePresentationWidget::~UBTeacherGuidePresentationWidget() @@ -484,6 +488,14 @@ UBTeacherGuidePresentationWidget::~UBTeacherGuidePresentationWidget() DELETEPTR(mpLayout); } +#ifdef Q_WS_MAC +void UBTeacherGuidePresentationWidget::onSliderMoved(int size) +{ + Q_UNUSED(size); + mpMediaSwitchItem->setExpanded(true); +} +#endif + bool UBTeacherGuidePresentationWidget::eventFilter(QObject* object, QEvent* event) { Q_UNUSED(object); diff --git a/src/gui/UBTeacherGuideWidget.h b/src/gui/UBTeacherGuideWidget.h index 775728e5..1d165f13 100644 --- a/src/gui/UBTeacherGuideWidget.h +++ b/src/gui/UBTeacherGuideWidget.h @@ -114,6 +114,12 @@ private: QTreeWidgetItem* mpRootWidgetItem; QTreeWidgetItem* mpMediaSwitchItem; + +#ifdef Q_WS_MACX +private slots: + void onSliderMoved(int size); +#endif + }; /*************************************************************************** From 0e9f7166d2b8426e8ad2139f59c3fad283e89e42 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 23 Aug 2012 20:11:23 +0200 Subject: [PATCH 05/16] fixed issue with flash and removed {} --- plugins/cffadaptor/src/UBCFFAdaptor.cpp | 18 ++++++++---------- src/board/UBBoardController.cpp | 2 +- src/domain/UBGraphicsWidgetItem.cpp | 6 +++++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index a0ea3216..68ec3ff9 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -919,7 +919,7 @@ bool UBCFFAdaptor::UBToCFFConverter::ibwAddLine(int x1, int y1, int x2, int y2, QDomElement svgBackgroundCrossPart = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":line"); QDomElement iwbBackgroundCrossPart = doc.createElementNS(iwbNS,iwbNsPrefix + ":" + tElement); - QString sUUID = QUuid::createUuid().toString().remove("{").remove("}"); + QString sUUID = QUuid::createUuid().toString(); svgBackgroundCrossPart.setTagName(tIWBLine); @@ -1061,7 +1061,7 @@ bool UBCFFAdaptor::UBToCFFConverter::setContentFromUBZ(const QDomElement &ubzEle QString sSrcFileName = sourcePath + "/" + srcPath ; QString fileExtention = getExtentionFromFileName(sSrcFileName); QString sDstContentFolder = getDstContentFolderName(ubzElement.tagName()); - QString sDstFileName(QString(QUuid::createUuid().toString()+"."+convertExtention(fileExtention)).remove("{").remove("}")); + QString sDstFileName(QString(QUuid::createUuid().toString()+"."+convertExtention(fileExtention))); if (itIsSupportedFormat(fileExtention)) // format is supported and we can copy src. files without changing. @@ -1268,7 +1268,7 @@ bool UBCFFAdaptor::UBToCFFConverter::setCFFAttribute(const QString &attributeNam QString id = tl.at(tl.count()-1); // if element already have an ID, we use it. Else we create new id for element. if (QString() == id) - id = QUuid::createUuid().toString().remove("{").remove("}"); + id = QUuid::createUuid().toString(); svgElement.setAttribute(aID, id); iwbElement.setAttribute(aRef, id); @@ -1382,11 +1382,9 @@ bool UBCFFAdaptor::UBToCFFConverter::createBackground(const QDomElement &element if (0 <= mViewbox.topLeft().y()) bckRect.topLeft().setY(0); -// QString backgroundImagePath = createBackgroundImage(element, QSize(bckRect.width(), bckRect.height())); -// if (QString() != backgroundImagePath) if (QRect() != bckRect) { - QString sElementID = QUuid::createUuid().toString().remove("{").remove("}"); + QString sElementID = QUuid::createUuid().toString(); bool darkBackground = (avTrue == element.attribute(aDarkBackground)); svgBackgroundElementPart.setAttribute(aFill, darkBackground ? "black" : "white"); @@ -1635,7 +1633,7 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZAudio(const QDomElement &element, Q //we must create image-containers for audio files int audioImageDimention = qMin(svgElementPart.attribute(aWidth).toInt(), svgElementPart.attribute(aHeight).toInt()); QString srcAudioImageFile(sAudioElementImage); - QString elementId = QString(QUuid::createUuid().toString()).remove("{").remove("}"); + QString elementId = QString(QUuid::createUuid().toString()); QString sDstAudioImageFileName = elementId+"."+fePng; QString dstAudioImageFilePath = destinationPath+"/"+cfImages+"/"+sDstAudioImageFileName; QString dstAudioImageRelativePath = cfImages+"/"+sDstAudioImageFileName; @@ -1793,7 +1791,7 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZPolygon(const QDomElement &element, if (0 < iwbElementPart.attributes().count()) { - QString id = QUuid::createUuid().toString().remove("{").remove("}"); + QString id = QUuid::createUuid().toString(); svgElementPart.setAttribute(aID, id); iwbElementPart.setAttribute(aRef, id); @@ -1826,7 +1824,7 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZPolyline(const QDomElement &element if (0 < iwbElementPart.attributes().count()) { - QString id = QUuid::createUuid().toString().remove("{").remove("}"); + QString id = QUuid::createUuid().toString(); svgElementPart.setAttribute(aID, id); iwbElementPart.setAttribute(aRef, id); @@ -1858,7 +1856,7 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZLine(const QDomElement &element, QM if (0 < iwbElementPart.attributes().count()) { - QString id = QUuid::createUuid().toString().remove("{").remove("}"); + QString id = QUuid::createUuid().toString(); svgElementPart.setAttribute(aID, id); iwbElementPart.setAttribute(aRef, id); diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 5015e90a..332ea3b0 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1230,7 +1230,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri if (widgetUrl.length() > 0) { UBGraphicsWidgetItem *widgetItem = mActiveScene->addW3CWidget(QUrl::fromLocalFile(widgetUrl), pPos); - + widgetItem->setUuid(QUuid::createUuid()); widgetItem->setSourceUrl(sourceUrl); UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 0f056860..f85074f8 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -114,7 +114,8 @@ void UBGraphicsWidgetItem::initialize() connect(page(), SIGNAL(linkClicked(const QUrl&)), this, SLOT(onLinkClicked(const QUrl&))); } -void UBGraphicsWidgetItem::onLinkClicked(const QUrl& url){ +void UBGraphicsWidgetItem::onLinkClicked(const QUrl& url) +{ UBApplication::webController->loadUrl(url); } @@ -846,6 +847,9 @@ UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphi /* is it a valid local file ? */ QFile f(mMainHtmlUrl.toLocalFile()); + qDebug() << mMainHtmlFileName; + qDebug() << mMainHtmlUrl.toLocalFile(); + if(!f.exists()) mMainHtmlUrl = QUrl(mMainHtmlFileName); From f7896e143e8c16b59bce3477bd509e9b4e83ceed Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 24 Aug 2012 10:20:26 +0200 Subject: [PATCH 06/16] fixed issue with flash on mac --- resources/sankore.qrc | 1 + src/core/UBPersistenceManager.cpp | 28 ++++++++++++++++ src/core/UBPersistenceManager.h | 1 + src/gui/UBTeacherGuideWidget.cpp | 5 +-- src/gui/UBTeacherGuideWidgetsTools.cpp | 45 ++++++++++++++++++++------ src/gui/UBTeacherGuideWidgetsTools.h | 4 +-- 6 files changed, 70 insertions(+), 14 deletions(-) diff --git a/resources/sankore.qrc b/resources/sankore.qrc index 9941c519..425c21c5 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -364,5 +364,6 @@ images/teacherGuide/w3c_24x24.svg images/teacherGuide/pencil.svg images/duplicateDisabled.svg + images/teacherGuide/flash_24x24.svg diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 954af5b5..2c025a7c 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -878,6 +878,34 @@ QString UBPersistenceManager::addObjectToTeacherGuideDirectory(UBDocumentProxy* return destPath; } +QString UBPersistenceManager::addWidgetToTeacherGuideDirectory(UBDocumentProxy* pDocumentProxy, QString pPath) +{ + QString path = UBFileSystemUtils::removeLocalFilePrefix(pPath); + QFileInfo fi(path); + Q_ASSERT(fi.isDir()); + + int lastIndex = path.lastIndexOf("."); + QString extension(""); + if(lastIndex != -1) + extension = path.right(path.length() - lastIndex); + + QString uuid = QUuid::createUuid(); + + if (!fi.exists() || !pDocumentProxy) + return ""; + + QString directoryName = UBPersistenceManager::teacherGuideDirectory + "/" + uuid + extension; + QString destPath = pDocumentProxy->persistencePath() + "/" + directoryName; + + if (!QDir(destPath).exists()){ + QDir dir; + dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::teacherGuideDirectory); + UBFileSystemUtils::copyDir(path,destPath); + } + + return destPath; +} + bool UBPersistenceManager::addFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, const QString& subdir, diff --git a/src/core/UBPersistenceManager.h b/src/core/UBPersistenceManager.h index 9ea21db3..79624b18 100644 --- a/src/core/UBPersistenceManager.h +++ b/src/core/UBPersistenceManager.h @@ -83,6 +83,7 @@ class UBPersistenceManager : public QObject QString teacherGuideAbsoluteObjectPath(UBDocumentProxy* pDocumentProxy); QString addObjectToTeacherGuideDirectory(UBDocumentProxy* proxy, QString pPath); + QString addWidgetToTeacherGuideDirectory(UBDocumentProxy* pDocumentProxy, QString pPath); virtual void addDirectoryContentToDocument(const QString& documentRootFolder, UBDocumentProxy* pDocument); diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 666c64e0..d7fd3493 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -565,7 +565,7 @@ void UBTeacherGuidePresentationWidget::showData( QVector data } else if (element->name == "media") { createMediaButtonItem(); - QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem( mpMediaSwitchItem); + QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem(mpMediaSwitchItem); newWidgetItem->setIcon(0, QIcon( ":images/teacherGuide/" + element->attributes.value("mediaType") + "_24x24.svg")); newWidgetItem->setText(0, element->attributes.value("title")); newWidgetItem->setData(0, tUBTGTreeWidgetItemRole_HasAnAction, tUBTGActionAssociateOnClickItem_MEDIA); @@ -582,7 +582,8 @@ void UBTeacherGuidePresentationWidget::showData( QVector data QTreeWidgetItem* mediaItem = new QTreeWidgetItem(newWidgetItem); mediaItem->setData(0, tUBTGTreeWidgetItemRole_HasAnAction, tUBTGActionAssociateOnClickItem_NONE); - UBTGMediaWidget* mediaWidget = new UBTGMediaWidget(element->attributes.value("relativePath"), newWidgetItem); + qDebug() << element->attributes.value("mediaType"); + UBTGMediaWidget* mediaWidget = new UBTGMediaWidget(element->attributes.value("relativePath"), newWidgetItem,0,element->attributes.value("mediaType").contains("flash")); newWidgetItem->setExpanded(false); mpTreeWidget->setItemWidget(mediaItem, 0, mediaWidget); } diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp index 71334fbb..d9c88efd 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.cpp +++ b/src/gui/UBTeacherGuideWidgetsTools.cpp @@ -304,7 +304,7 @@ UBTGMediaWidget::UBTGMediaWidget(QTreeWidgetItem* widget, QWidget* parent,const setMinimumHeight(250); } -UBTGMediaWidget::UBTGMediaWidget(QString mediaPath, QTreeWidgetItem* widget, QWidget* parent,const char* name): QStackedWidget(parent) +UBTGMediaWidget::UBTGMediaWidget(QString mediaPath, QTreeWidgetItem* widget, QWidget* parent,bool forceFlashMediaType,const char* name): QStackedWidget(parent) , mpTreeWidgetItem(widget) , mpDropMeWidget(NULL) , mpWorkWidget(NULL) @@ -320,7 +320,7 @@ UBTGMediaWidget::UBTGMediaWidget(QString mediaPath, QTreeWidgetItem* widget, QWi setObjectName(name); mMediaPath = UBApplication::boardController->selectedDocument()->persistencePath()+ "/" + mediaPath; setAcceptDrops(false); - createWorkWidget(); + createWorkWidget(forceFlashMediaType); setFixedHeight(200); } @@ -343,8 +343,7 @@ void UBTGMediaWidget::initializeWithDom(QDomElement element) mIsInitializationMode = true; setAcceptDrops(false); mMediaPath = UBApplication::boardController->selectedDocument()->persistencePath() + "/" + element.attribute("relativePath"); - qDebug() << mMediaPath; - createWorkWidget(); + createWorkWidget(element.attribute("mediaType").contains("flash")); setFixedHeight(200); mpTitle->setInitialText(element.attribute("title")); mIsInitializationMode = false; @@ -369,8 +368,12 @@ void UBTGMediaWidget::hideEvent(QHideEvent* event) void UBTGMediaWidget::showEvent(QShowEvent* event) { QWidget::showEvent(event); - if(mpWebView) - mpWebView->load(QUrl(mMediaPath + "/index.htm")); + if(mpWebView){ + QString indexPath = mMediaPath+"/index.htm"; + if(!QFile::exists(indexPath)) + indexPath += "l"; + mpWebView->load(QUrl::fromLocalFile(indexPath)); + } } tUBGEElementNode* UBTGMediaWidget::saveData() @@ -392,7 +395,7 @@ void UBTGMediaWidget::dragEnterEvent(QDragEnterEvent *event) event->accept(); } -void UBTGMediaWidget::createWorkWidget() +void UBTGMediaWidget::createWorkWidget(bool forceFlashMediaType) { QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mMediaPath); bool setMedia = true; @@ -419,12 +422,32 @@ void UBTGMediaWidget::createWorkWidget() mpMediaLabelWidget->setPixmap(pixmap); mpMediaLabelWidget->setScaledContents(true); } - else if(mimeType.contains("application")){ + else if(mimeType.contains("widget") && !forceFlashMediaType){ mMediaType = "w3c"; + if(!(mIsPresentationMode || mIsInitializationMode)){ + mMediaPath = UBPersistenceManager::persistenceManager()->addWidgetToTeacherGuideDirectory(proxyDocument, mMediaPath); + } + mpWebView = new UBDraggableWeb(mMediaPath); + mpWebView->setAcceptDrops(false); + mpWebView->settings()->setAttribute(QWebSettings::JavaEnabled, true); + mpWebView->settings()->setAttribute(QWebSettings::PluginsEnabled, true); + mpWebView->settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true); + mpWebView->settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true); + mpWebView->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true); + mpWebView->settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true); + mpWebView->settings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true); + QString indexPath = mMediaPath+"/index.htm"; + if(!QFile::exists(indexPath)) + indexPath += "l"; + mpWebView->load(QUrl::fromLocalFile(indexPath)); + } + else if(mimeType.contains("x-shockwave-flash") || forceFlashMediaType){ + mMediaType = "flash"; if(!(mIsPresentationMode || mIsInitializationMode)){ QDir baseW3CDirectory(UBPersistenceManager::persistenceManager()->teacherGuideAbsoluteObjectPath(proxyDocument)); mMediaPath = UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(mMediaPath,baseW3CDirectory,mimeType,QSize(100,100),QUuid::createUuid()); } + qDebug() << mMediaPath; mpWebView = new UBDraggableWeb(mMediaPath); mpWebView->setAcceptDrops(false); mpWebView->settings()->setAttribute(QWebSettings::JavaEnabled, true); @@ -434,8 +457,10 @@ void UBTGMediaWidget::createWorkWidget() mpWebView->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true); mpWebView->settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true); mpWebView->settings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true); - - mpWebView->load(QUrl(mMediaPath+"/index.htm")); + QString indexPath = mMediaPath+"/index.htm"; + if(!QFile::exists(indexPath)) + indexPath += "l"; + mpWebView->load(QUrl::fromLocalFile(indexPath)); } else{ qDebug() << "createWorkWidget mime type not handled" << mimeType; diff --git a/src/gui/UBTeacherGuideWidgetsTools.h b/src/gui/UBTeacherGuideWidgetsTools.h index 43e726e3..e4ee8c53 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.h +++ b/src/gui/UBTeacherGuideWidgetsTools.h @@ -137,7 +137,7 @@ class UBTGMediaWidget : public QStackedWidget , public iUBTGSaveData Q_OBJECT public: UBTGMediaWidget(QTreeWidgetItem* widget = 0, QWidget* parent = 0, const char* name = "UBTGMediaWidget"); - UBTGMediaWidget(QString mediaPath, QTreeWidgetItem* widget = 0, QWidget* parent = 0, const char* name = "UBTGMediaWidget"); + UBTGMediaWidget(QString mediaPath, QTreeWidgetItem* widget = 0, QWidget* parent = 0, bool forceFlashMediaType = false, const char *name = "UBTGMediaWidget"); ~UBTGMediaWidget(); tUBGEElementNode* saveData(); void initializeWithDom(QDomElement element); @@ -152,7 +152,7 @@ protected: private: void parseMimeData(const QMimeData* pMimeData); - void createWorkWidget(); + void createWorkWidget(bool forceFlashMediaType = false); void updateSize(); QTreeWidgetItem* mpTreeWidgetItem; From fd7b50d0df0af37eb21015637f350b59a9869d67 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 24 Aug 2012 10:31:37 +0200 Subject: [PATCH 07/16] dnd from the title of media --- src/gui/UBTeacherGuideWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index d7fd3493..7de10dbf 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -457,7 +457,6 @@ UBTeacherGuidePresentationWidget::UBTeacherGuidePresentationWidget(QWidget *pare mpLayout->addWidget(mpTreeWidget); mpRootWidgetItem = mpTreeWidget->invisibleRootItem(); - mpTreeWidget->setSelectionMode(QAbstractItemView::NoSelection); mpTreeWidget->setDragEnabled(true); mpTreeWidget->setRootIsDecorated(false); mpTreeWidget->setIndentation(0); From 18b7f8b12d0fa4cbde0165f9580fe4b7860c4d32 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 24 Aug 2012 11:30:33 +0200 Subject: [PATCH 08/16] duplicated style because doesn't work (workaround) --- resources/style.qss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/style.qss b/resources/style.qss index a754c544..e53e0ee6 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -14,6 +14,15 @@ QWidget#UBFeaturesCentralWidget border: 2px solid #999999; } +QTextEdit, +QLineEdit, +QComboBox#DockPaletteWidgetComboBox QAbstractItemView +{ + selection-background-color: lightgreen; + selection-color: black; +} + + QWidget#mAdditionalDataContainer { border-radius: 10px; From 2bbdbc9bba0fc6bb4b58ae70bfc258b235b69fc0 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 24 Aug 2012 12:34:16 +0300 Subject: [PATCH 09/16] Eraser under Linux platform --- src/domain/UBGraphicsScene.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 6b573710..540ce297 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -844,14 +844,18 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) // UBGraphicsPolygonItems and added to the scene foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons()) { - UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol); + UBGraphicsPolygonItem* croppedPolygonItem; #pragma omp critical - if(NULL != pGroup){ - croppedPolygonItem->setStrokesGroup(pGroup); - //pGroup->addToGroup(croppedPolygonItem); + { + croppedPolygonItem = collidingPolygonItem->deepCopy(pol); + + if(NULL != pGroup){ + croppedPolygonItem->setStrokesGroup(pGroup); + //pGroup->addToGroup(croppedPolygonItem); + } + // Add this new polygon to the 'added' list + toBeAddedItems << croppedPolygonItem; } - // Add this new polygon to the 'added' list - toBeAddedItems << croppedPolygonItem; } #pragma omp critical // Remove the original polygonitem because it has been replaced by many smaller polygons From 0ab928788cd75e502235fde1ce48b68e1602f638 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 24 Aug 2012 13:02:53 +0200 Subject: [PATCH 10/16] updated translations --- resources/i18n/sankore_ar.ts | 292 ++++++++++-------------- resources/i18n/sankore_bg.ts | 293 ++++++++++-------------- resources/i18n/sankore_ca.ts | 292 ++++++++++-------------- resources/i18n/sankore_cs.ts | 378 +++++++++++++++---------------- resources/i18n/sankore_da.ts | 292 ++++++++++-------------- resources/i18n/sankore_de.ts | 292 ++++++++++-------------- resources/i18n/sankore_el.ts | 292 ++++++++++-------------- resources/i18n/sankore_en.ts | 282 ++++++++++------------- resources/i18n/sankore_en_UK.ts | 282 ++++++++++------------- resources/i18n/sankore_es.ts | 292 ++++++++++-------------- resources/i18n/sankore_fr.ts | 296 ++++++++++-------------- resources/i18n/sankore_fr_CH.ts | 296 ++++++++++-------------- resources/i18n/sankore_it.ts | 330 ++++++++++++--------------- resources/i18n/sankore_iw.ts | 292 ++++++++++-------------- resources/i18n/sankore_ja.ts | 292 ++++++++++-------------- resources/i18n/sankore_ko.ts | 292 ++++++++++-------------- resources/i18n/sankore_mg.ts | 389 +++++++++++++++----------------- resources/i18n/sankore_nb.ts | 292 ++++++++++-------------- resources/i18n/sankore_nl.ts | 292 ++++++++++-------------- resources/i18n/sankore_pl.ts | 292 ++++++++++-------------- resources/i18n/sankore_pt.ts | 294 ++++++++++-------------- resources/i18n/sankore_rm.ts | 282 ++++++++++------------- resources/i18n/sankore_ro.ts | 292 ++++++++++-------------- resources/i18n/sankore_ru.ts | 292 ++++++++++-------------- resources/i18n/sankore_sk.ts | 297 ++++++++++-------------- resources/i18n/sankore_sv.ts | 292 ++++++++++-------------- resources/i18n/sankore_tr.ts | 292 ++++++++++-------------- resources/i18n/sankore_zh.ts | 292 ++++++++++-------------- 28 files changed, 3479 insertions(+), 4904 deletions(-) diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index f9a14df9..29860c7f 100644 --- a/resources/i18n/sankore_ar.ts +++ b/resources/i18n/sankore_ar.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents استيراد وثائق Sankore أو Uniboard قديمة - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - /Home - Category list label on navigation tool bar - /الصفحة البدء - - - Trash - Pictures category element - سلة المهملات + Element ID = + - - - UBAbstractWidget - Loading ... - تحميل... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) دعم الجميع (1%) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1170,12 +1173,20 @@ حفظ الملف 1% - Importing page %1 of %2 - استيراد الصفحة 1% من 2% + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - بيانات صور خاطئة، تخطي الملف 1% + Import successful. + استيراد ناجح + + + Importing file + + + + Import of file %1 successful. + @@ -1253,6 +1264,13 @@ إلغاء + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1432,6 +1450,53 @@ ImportedImage الصورة المستوردة + + Audios + ملفات صوتية + + + Movies + أفلام + + + Pictures + صور + + + Animations + حركات + + + Interactivities + تفاعلات + + + Applications + تطبيقات + + + Shapes + أشكال + + + Favorites + + + + Web search + + + + Trash + سلة المهملات + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1466,6 +1531,24 @@ قابل للنشر + + UBGraphicsW3CWidgetItem + + Web + الويب + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + تحميل... + + UBGraphicsWidgetItemDelegate @@ -1525,14 +1608,6 @@ Image Format ( شكل الصورة ( - - Image import failed. - فشل استيراد صورة - - - Image import successful. - استيراد صورة ناجح. - UBImportPDF @@ -1548,10 +1623,6 @@ Importing page %1 of %2 استيراد الصفحة 1% من 2% - - PDF import successful. - نجاح استيراد PDF. - UBIntranetPodcastPublisher @@ -1578,120 +1649,6 @@ دخول - - UBLibActionBar - - Add to favorites - الاضافة الى المفضلة - - - Share - تقاسم - - - Search - بحث - - - Delete - حذف - - - Back to folder - العودة الى المجلد - - - Remove from favorites - الحذف المفضلة - - - Create new folder - انشاء مجلد جديد - - - - UBLibItemProperties - - Add to page - الاضافة الى الصفحة - - - Set as background - تعيين كخلفية - - - Add to library - الاضافة الى المكتبة - - - Object informations - معلومات حول الأشياء - - - - UBLibraryController - - Added 1 Image to Library - اضافة 1 صورة الى المكتبة - - - Audios - Audio category element - ملفات صوتية - - - Movies - Movies category element - أفلام - - - Pictures - Pictures category element - صور - - - Shapes - Shapes category element - أشكال - - - Applications - Applications category element - تطبيقات - - - Favorite - Favorite category element - مفضل - - - Interactivities - Interactives category element - تفاعلات - - - Creating image thumbnail for %1. - انشاء صور مصغرة لـ 1%. - - - Adding to page failed for item %1. - فشل الاضافة للصفحة بالنسبة للعنصر 1%. - - - ImportedImage - الصورة المستوردة - - - Animations - Animations category element - حركات - - - Web Search - Web search category element - البحث على الويب - - UBMainWindow @@ -1707,6 +1664,13 @@ موافق + + UBMessagesDialog + + Close + Close + + UBNetworkAccessManager @@ -1736,25 +1700,6 @@ Do you want to ignore these errors for this host? لا - - UBNewFolderDlg - - Add new folder - اضافة مجلد جديد - - - New Folder name: - اسم المجلد الجديد: - - - Add - اضافة - - - Cancel - إلغاء - - UBPersistenceManager @@ -1915,6 +1860,14 @@ Do you want to ignore these errors for this host? My Movies أفلامي + + Group + + + + Ungroup + + UBTGActionWidget @@ -2194,13 +2147,6 @@ Please reboot the application to access the updated documents. التذكير لاحقا - - UBW3CWidget - - Web - الويب - - UBWebPluginWidget diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/sankore_bg.ts index 71ca88c2..3a3b14a1 100644 --- a/resources/i18n/sankore_bg.ts +++ b/resources/i18n/sankore_bg.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Вмъкни стари Санкоре или Uniboard документи - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Кошче - - - /Home - Category list label on navigation tool bar - /Начало + Element ID = + - - - UBAbstractWidget - Loading ... - Зареждане... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Всички поддържани (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1166,12 +1169,20 @@ Файлът %1 е запазен - Importing page %1 of %2 - Импортиране на страница %1 от %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Проблем при изображенията, пропускане на файла %1 + Import successful. + Импортирането успешно. + + + Importing file + + + + Import of file %1 successful. + @@ -1245,6 +1256,13 @@ Отмени + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1424,6 +1442,53 @@ ImportedImage Вмъкнати изображения + + Audios + Звук + + + Movies + Филми + + + Pictures + Изображения + + + Animations + Анимация + + + Interactivities + Интерактивни обекти + + + Applications + Приложения + + + Shapes + Форми + + + Favorites + + + + Web search + + + + Trash + Кошче + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1458,6 +1523,24 @@ Възможност за редактиране + + UBGraphicsW3CWidgetItem + + Web + Мрежа + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Зареждане... + + UBGraphicsWidgetItemDelegate @@ -1517,14 +1600,6 @@ Image Format ( Формат на изображението ( - - Image import failed. - Грешка при вмъкването на изображението. - - - Image import successful. - Вмъкването на изображението е успешно. - UBImportPDF @@ -1540,10 +1615,6 @@ Importing page %1 of %2 Вмъкване на страница %1 от %2 - - PDF import successful. - Вмъкването на PDF е успешно. - UBIntranetPodcastPublisher @@ -1570,121 +1641,6 @@ Вход - - UBLibActionBar - - Add to favorites - Добави в любими - - - Share - Сподели - - - Search - Търсене - - - Delete - Изтриване - - - Back to folder - Обратно в папка - - - Remove from favorites - Премахване от любими - - - Create new folder - Създаване на нова папка - - - - UBLibItemProperties - - Add to page - Добави към страницата - - - Set as background - Задай като фон - - - Add to library - Добави в библиотека - - - Object informations - Информация за обекта - - - - UBLibraryController - - Added 1 Image to Library - 1 изображение е добавено към библиотека - - - Audios - Audio category element - Звук - - - Movies - Movies category element - Филми - - - Pictures - Pictures category element - Изображения - - - Shapes - Shapes category element - Форми - - - Applications - Applications category element - Приложения - - - Favorite - Favorite category element - Любим - - - Creating image thumbnail for %1. - Създаване на икона за %1. - - - Adding to page failed for item %1. - Грешка към добаване към страницата на обект %1. - - - Interactivities - Interactives category element - Интерактивни обекти - - - ImportedImage - maybe there should be SPACE between imported and image in the English text - Вмъкнати изображения - - - Animations - Animations category element - Анимация - - - Web Search - Web search category element - Търсене в интернет - - UBMainWindow @@ -1700,6 +1656,13 @@ Добре + + UBMessagesDialog + + Close + Затвори + + UBNetworkAccessManager @@ -1735,25 +1698,6 @@ Do you want to ignore these errors for this host? Не - - UBNewFolderDlg - - Add new folder - Добави нова папка - - - New Folder name: - Име на нова папка: - - - Add - Добави - - - Cancel - Отмени - - UBPersistenceManager @@ -1914,6 +1858,14 @@ Do you want to ignore these errors for this host? My Movies Моите филми + + Group + + + + Ungroup + + UBTGActionWidget @@ -2191,13 +2143,6 @@ Please reboot the application to access the updated documents. Напомни ми по-късно - - UBW3CWidget - - Web - Мрежа - - UBWebPluginWidget diff --git a/resources/i18n/sankore_ca.ts b/resources/i18n/sankore_ca.ts index e7c0e1ec..06222ba9 100644 --- a/resources/i18n/sankore_ca.ts +++ b/resources/i18n/sankore_ca.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importa documents antics de l'Uniboard o del Sankoré - - Group Items - Agrupa elements - Group items Agrupa elements @@ -823,6 +819,10 @@ Remove the backgound Elimina el fons + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Paperera - - - /Home - Category list label on navigation tool bar - /Inici + Element ID = + - - - UBAbstractWidget - Loading ... - S'està carregant... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ Unknown content type %1 Tipus desconegut de contingut %1 + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1166,12 +1169,20 @@ S'ha desat el fitxer %1 - Importing page %1 of %2 - S'està important la pàgina %1 de %2 + Inserting page %1 of %2 + + + + Import successful. + La importació ha estat correcta. - Erronous image data, skipping file %1 - La imatge conté dades errònies, s'ometrà el fitxer %1 + Importing file + + + + Import of file %1 successful. + @@ -1246,6 +1257,13 @@ Cancel·la + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1425,6 +1443,53 @@ ImportedImage ImportedImage + + Audios + Àudios + + + Movies + Pel·lícules + + + Pictures + Imatges + + + Animations + Animacions + + + Interactivities + Interactivitats + + + Applications + Aplicacions + + + Shapes + Formes + + + Favorites + + + + Web search + + + + Trash + Paperera + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1459,6 +1524,24 @@ Editable + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + S'està carregant... + + UBGraphicsWidgetItemDelegate @@ -1518,14 +1601,6 @@ Image Format ( Format d'imatge ( - - Image import failed. - Ha fallat la importació de la imatge. - - - Image import successful. - La importació de la imatge ha estat correcta. - UBImportPDF @@ -1541,10 +1616,6 @@ Importing page %1 of %2 S'està important la pàgina %1 de %2 - - PDF import successful. - La importació del PDF ha estat correcta. - UBIntranetPodcastPublisher @@ -1571,120 +1642,6 @@ Entra - - UBLibActionBar - - Add to favorites - Afegeix als llocs d'interès - - - Share - Comparteix - - - Search - Cerca - - - Delete - Esborra - - - Back to folder - Torna a la carpeta - - - Remove from favorites - Elimina dels llocs d'interès - - - Create new folder - Crea una carpeta nova - - - - UBLibItemProperties - - Add to page - Afegeix a la pàgina - - - Set as background - Estableix com a fons - - - Add to library - Afegeix a la biblioteca - - - Object informations - Informacions de l'objecte - - - - UBLibraryController - - Added 1 Image to Library - S'ha afegit una imatge a la biblioteca - - - Audios - Audio category element - Àudios - - - Movies - Movies category element - Pel·lícules - - - Pictures - Pictures category element - Imatges - - - Shapes - Shapes category element - Formes - - - Applications - Applications category element - Aplicacions - - - Favorite - Favorite category element - Preferits - - - Creating image thumbnail for %1. - S'està creant la miniatura de la imatge per a %1. - - - Adding to page failed for item %1. - Ha fallat l'acció d'afegir l'element %1 a la pàgina. - - - Interactivities - Interactives category element - Interactivitats - - - ImportedImage - ImportedImage - - - Animations - Animations category element - Animacions - - - Web Search - Web search category element - Cerca a la Web - - UBMainWindow @@ -1700,6 +1657,13 @@ D'acord + + UBMessagesDialog + + Close + Tanca + + UBNetworkAccessManager @@ -1735,25 +1699,6 @@ Voleu ignorar aquests errors per a aquest amfitrió? No - - UBNewFolderDlg - - Add new folder - Afegeix una carpeta nova - - - New Folder name: - Nom de la carpeta nova: - - - Add - Afegeix - - - Cancel - Canceŀla - - UBPersistenceManager @@ -1914,6 +1859,14 @@ Voleu ignorar aquests errors per a aquest amfitrió? My Movies Les meves pel·lícules + + Group + + + + Ungroup + + UBTGActionWidget @@ -2187,13 +2140,6 @@ Reinicieu l'aplicació per accedir als documents actualitzats.Recorda-m'ho després - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_cs.ts b/resources/i18n/sankore_cs.ts index 6a3681c0..d03edaf8 100644 --- a/resources/i18n/sankore_cs.ts +++ b/resources/i18n/sankore_cs.ts @@ -801,10 +801,6 @@ Erase Annotation Vymazat anotaci - - Group Items - Seskupit položky - Group items Seskupit položky @@ -825,6 +821,10 @@ Remove the backgound Odstranit pozadí + + Group + + PasswordDialog @@ -867,21 +867,12 @@ QObject - /Home - Category list label on navigation tool bar - /Domů - - - Trash - Pictures category element - Koš + Element ID = + - - - UBAbstractWidget - Loading ... - Nahrává se... + Content is not supported in destination format. + @@ -944,6 +935,18 @@ Download finished Stahování dokončeno + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -951,6 +954,10 @@ Error Adding Image to Library Chyba při přidávání obrázku do knihovny + + CapturedImage + + UBCachePropertiesWidget @@ -1132,6 +1139,10 @@ Add Pages from File Přidat stránky ze souboru + + Title page + + UBDocumentManager @@ -1143,10 +1154,6 @@ objects objekty - - Erronous image data, skipping file %1 - Chybné údaje o obrázku, přeskakuje se soubor %1 - images obrázky @@ -1164,8 +1171,20 @@ Soubor %1 byl uložen - Importing page %1 of %2 - Nahrává se stránka %1 z(e) %2 + Inserting page %1 of %2 + + + + Import successful. + Import byl úspěšně dokončen. + + + Importing file + + + + Import of file %1 successful. + @@ -1174,6 +1193,10 @@ Page %0 Stránka %0 + + Title page + + UBDocumentPublisher @@ -1236,6 +1259,13 @@ Zrušit + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1404,6 +1434,10 @@ Create new folder Vytvořit novou složku + + Rescan file system + + UBFeaturesController @@ -1411,6 +1445,53 @@ ImportedImage NahranýObrázek + + Audios + Zvuky + + + Movies + Filmy + + + Pictures + Obrázky + + + Animations + Animace + + + Interactivities + Interaktivity + + + Applications + Aplikace + + + Shapes + Tvary + + + Favorites + + + + Web search + + + + Trash + Koš + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1445,6 +1526,24 @@ Upravitelný + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Nahrává se... + + UBGraphicsWidgetItemDelegate @@ -1504,14 +1603,6 @@ Image Format ( Soubor obrázku ( - - Image import failed. - Import obrázku se nezdařil. - - - Image import successful. - Import obrázku byl úspěšně dokončen. - UBImportPDF @@ -1519,10 +1610,6 @@ PDF import failed. Import do PDF selhal. - - PDF import successful. - Import do PDF byl úspěšně dokončen. - Importing page %1 of %2 Importuje se stránka %1 z(e) %2 @@ -1557,120 +1644,6 @@ Enter - - UBLibActionBar - - Share - Sdílet - - - Back to folder - Zpět na složku - - - Remove from favorites - Odstranit z oblíbených - - - Delete - Smazat - - - Search - Hledat - - - Add to favorites - Přidat do oblíbených - - - Create new folder - Vytvořit novou složku - - - - UBLibItemProperties - - Object informations - Informace o objektu - - - Add to library - Přidat do knihovny - - - Set as background - Nastavit jako pozadí - - - Add to page - Přidat na stránku - - - - UBLibraryController - - Creating image thumbnail for %1. - Vytváří se miniatura obrázku z(e) %1. - - - Adding to page failed for item %1. - Na stránku se nepodařilo přidat položku %1. - - - Added 1 Image to Library - Přidán 1 obrázek do knihovny - - - ImportedImage - NahranýObrázek - - - Audios - Audio category element - Zvuky - - - Movies - Movies category element - Filmy - - - Pictures - Pictures category element - Obrázky - - - Shapes - Shapes category element - Tvary - - - Applications - Applications category element - Aplikace - - - Favorite - Favorite category element - Oblíbené - - - Interactivities - Interactives category element - Interaktivity - - - Web Search - Web search category element - Vyhledat na webu - - - Animations - Animations category element - Animace - - UBMainWindow @@ -1686,6 +1659,13 @@ Ano + + UBMessagesDialog + + Close + Zavřít + + UBNetworkAccessManager @@ -1721,25 +1701,6 @@ Do you want to ignore these errors for this host? Chcete ignorovat tyto chyby na tomto serveru? - - UBNewFolderDlg - - Add - Přidat - - - New Folder name: - Název nové složky: - - - Cancel - Zrušit - - - Add new folder - Přidat novou složku - - UBPersistenceManager @@ -1900,6 +1861,14 @@ Chcete ignorovat tyto chyby na tomto serveru? Untitled Documents Dokumenty bez názvu + + Group + + + + Ungroup + + UBTGActionWidget @@ -1970,10 +1939,6 @@ Chcete ignorovat tyto chyby na tomto serveru? UBTeacherGuidePageZeroWidget - - Page 0 - Stránka 0 - Type session title here ... Sem napište titulek relace ... @@ -2064,6 +2029,10 @@ Chcete ignorovat tyto chyby na tomto serveru? Aktualizováno: + + Title page + + UBTeacherGuidePresentationWidget @@ -2178,13 +2147,6 @@ Znovu spusťte aplikaci, abyste mohli pracovat s aktualizovanými dokumenty.Připomenout později - - UBW3CWidget - - Web - Web - - UBWebPluginWidget @@ -3273,6 +3235,10 @@ p, li { white-space: pre-wrap; } <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-size:12pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-size:9pt;"> </span></p></td></tr></table></body></html> + + Credits + Zásluhy + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -3281,24 +3247,54 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - - - - Credits - Zásluhy +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:12pt; font-weight:600;">Fonts</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Thanks to Henri ROGELET for Script-École 2, ScriptCase-École, Alphonetic (</span><a href="http://pointecole.free.fr/polices.html"><span style=" font-family:'Arial'; text-decoration: underline; color:#0000ff;">http://pointecole.free.fr/polices.html</span></a><span style=" font-family:'Arial';">).</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Andika Copyright (c) 2004-2011, SIL International (http://www.sil.org/). Licensed under the SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL), with Reserved Font Names &quot;Andika&quot; and &quot;SIL&quot;.</span></p> -<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; color:#000000;">- Ecolier CC BY-NC-ND 2.0 (JM Douteau)</span></p></body></html> - +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Crédits police scolaire Open-Sankoré : </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police Andika Basic dispose d'une licence Open Font License </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Sil international</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Court </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Ligne Court</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier lignes pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p></body></html> + diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index eee80f2c..49cd62d7 100644 --- a/resources/i18n/sankore_da.ts +++ b/resources/i18n/sankore_da.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importer ældre version af Sankoré eller Uniboard-dokumenter - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Papirkurv - - - /Home - Category list label on navigation tool bar - /Hjem + Element ID = + - - - UBAbstractWidget - Loading ... - Indlæser... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Alle understøttede (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Fil %1 gemt - Importing page %1 of %2 - Importerer side %1 af %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Fejlpåhæftet billeddata, springer filen over %1 + Import successful. + Import gennemført. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Annuller + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage ImporteretBillede + + Audios + Lydiler + + + Movies + Film + + + Pictures + Billeder + + + Animations + Animationer + + + Interactivities + Interaktiviteter + + + Applications + Applikationer + + + Shapes + Former + + + Favorites + + + + Web search + + + + Trash + Papirkurv + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Kan redigeres + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Indlæser... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Billedformat ( - - Image import failed. - Import af billede mislykkedes. - - - Image import successful. - Import af billede gennemført. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importerer side %1 af %2 - - PDF import successful. - Import at PDF gennemført. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Enter - - UBLibActionBar - - Add to favorites - Tilføj til favoritter - - - Share - Del - - - Search - Søg - - - Delete - Slet - - - Back to folder - Tilbage til mappe - - - Remove from favorites - Fjern fra favoritter - - - Create new folder - Opret ny mappe - - - - UBLibItemProperties - - Add to page - Tilføj til side - - - Set as background - Brug som baggrund - - - Add to library - Tilføj til bibliotek - - - Object informations - Oplysninger om objekt - - - - UBLibraryController - - Added 1 Image to Library - Tilføjet 1 billede til bibliotek - - - Audios - Audio category element - Lydiler - - - Movies - Movies category element - Film - - - Pictures - Pictures category element - Billeder - - - Shapes - Shapes category element - Former - - - Applications - Applications category element - Applikationer - - - Favorite - Favorite category element - Favorit - - - Creating image thumbnail for %1. - Opretter miniaturebillede for %1. - - - Adding to page failed for item %1. - Tilføjelse til side mislykkedes for enhed %1. - - - Interactivities - Interactives category element - Interaktiviteter - - - ImportedImage - ImporteretBillede - - - Animations - Animations category element - Animationer - - - Web Search - Web search category element - Søgning på Internettet - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Luk + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Do you want to ignore these errors for this host? Nej - - UBNewFolderDlg - - Add new folder - Tilføj ny mappe - - - New Folder name: - Navn på ny mappe: - - - Add - Tilføj - - - Cancel - Annuller - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Do you want to ignore these errors for this host? My Movies Mine Film + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Genstart venligst applikationen for at få adgang til de opdaterede dokumenter.< Påmind mig senere - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index 5b750938..3d072dda 100644 --- a/resources/i18n/sankore_de.ts +++ b/resources/i18n/sankore_de.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Alte Sankore oder Uniboard Dokumente importieren - - Group Items - Objekte gruppieren - Group items Objekte gruppieren @@ -823,6 +819,10 @@ Remove the backgound Hintergrund entfernen + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Papierkorb + Element ID = + - /Home - Category list label on navigation tool bar - /Startseite - - - - UBAbstractWidget - - Loading ... - Lädt... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Alle unterstützt (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Datei %1 gespeichert - Importing page %1 of %2 - Seite %1 von %2 wird importiert + Inserting page %1 of %2 + + + + Import successful. + Import erfolgreich. - Erronous image data, skipping file %1 - Fehlerhafte Bilddateien, Datei %1 überspringen + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Abbrechen + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Importiertes Bild + + Audios + Audiodateien + + + Movies + Filme + + + Pictures + Bilder + + + Animations + Animationen + + + Interactivities + Interaktivitäten + + + Applications + Anwendungen + + + Shapes + Formen + + + Favorites + + + + Web search + + + + Trash + Papierkorb + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Editierbar + + UBGraphicsW3CWidgetItem + + Web + Internet + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Lädt... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Bildformat ( - - Image import failed. - Bild-Import fehlgeschlagen. - - - Image import successful. - Bild-Import erfolgreich. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Seite %1 von %2 wird importiert - - PDF import successful. - PDF-Import erfolgreich. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Eingabe - - UBLibActionBar - - Add to favorites - Zu Favoriten hinzufügen - - - Share - Teilen - - - Search - Suchen - - - Delete - Löschen - - - Back to folder - Zurück zum Ordner - - - Remove from favorites - Aus Favoritenliste entfernen - - - Create new folder - Neuen Ordner erstellen - - - - UBLibItemProperties - - Add to page - Zur Seite hinzufügen - - - Set as background - Als Hintergrund festlegen - - - Add to library - Zur Bibliothek hinzufügen - - - Object informations - Objektinformationen - - - - UBLibraryController - - Added 1 Image to Library - 1 Bild wurde der Bibliothek hinzugefügt - - - Audios - Audio category element - Audiodateien - - - Movies - Movies category element - Filme - - - Pictures - Pictures category element - Bilder - - - Shapes - Shapes category element - Formen - - - Applications - Applications category element - Anwendungen - - - Favorite - Favorite category element - Favorit - - - Creating image thumbnail for %1. - Bild in Miniaturansicht für %1 wird erstellt. - - - Adding to page failed for item %1. - Objekt %1 konnte der Seite nicht hinzugefügt werden. - - - Interactivities - Interactives category element - Interaktivitäten - - - ImportedImage - Importiertes Bild - - - Animations - Animations category element - Animationen - - - Web Search - Web search category element - Web-Suche - - UBMainWindow @@ -1698,6 +1655,13 @@ OK + + UBMessagesDialog + + Close + Schließen + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? Nein - - UBNewFolderDlg - - Add new folder - Neuen Ordner hinzufügen - - - New Folder name: - Neuer Ordnername: - - - Add - Hinzufügen - - - Cancel - Abbrechen - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? My Movies Meine Filme + + Group + + + + Ungroup + + UBTGActionWidget @@ -2198,13 +2151,6 @@ Bitte starten Sie die Anwendung erneut, um auf die aktualisierten Dokumente zugr Später erinnern - - UBW3CWidget - - Web - Internet - - UBWebPluginWidget diff --git a/resources/i18n/sankore_el.ts b/resources/i18n/sankore_el.ts index 2f78b54b..85791ef2 100644 --- a/resources/i18n/sankore_el.ts +++ b/resources/i18n/sankore_el.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Εισαγωγή παλαιών εγγράφων Sankore ή Uniboard - - Group Items - Ομαδοποίηση αντικειμένων - Group items Ομαδοποίηση αντικειμένων @@ -823,6 +819,10 @@ Remove the backgound Αφαίρεση παρασκηνίου + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Κάδος ανακύκλωσης - - - /Home - Category list label on navigation tool bar - /Αρχική + Element ID = + - - - UBAbstractWidget - Loading ... - Φόρτωση... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Όλα προστατευόμενα (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Το αρχείο %1 αποθηκεύτηκε - Importing page %1 of %2 - Εισαγωγή σελίδας %1 από %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Εσφαλμένα δεδομένα εικόνας. Παράλειψη αρχείου %1. + Import successful. + Επιτυχημένη εισαγωγή + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Άκυρο + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Εισηγμένη εικόνα + + Audios + Ήχοι + + + Movies + Ταινίες + + + Pictures + Εικόνες + + + Animations + Κινούμενες αποτυπώσεις + + + Interactivities + Διαδραστικά εφαρμογίδια + + + Applications + Εφαρμογές + + + Shapes + Σχήματα + + + Favorites + + + + Web search + + + + Trash + Κάδος ανακύκλωσης + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Επεξεργάσιμο + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Φόρτωση... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Μορφή εικόνας ( - - Image import failed. - Η εισαγωγή της εικόνας απέτυχε - - - Image import successful. - Η εισαγωγή της εικόνας πέτυχε - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Εισαγωγή σελίδας %1 από %2 - - PDF import successful. - Επιτυχημένη εισαγωγή PDF - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Εισαγωγή - - UBLibActionBar - - Add to favorites - Προσθήκη στα αγαπημένα - - - Share - Διαμοιρασμός - - - Search - Αναζήτηση - - - Delete - Διαγραφή - - - Back to folder - Επιστροφή στον φάκελο - - - Remove from favorites - Αφαίρεση από τα αγαπημένα - - - Create new folder - Δημουργία νέου φακέλου - - - - UBLibItemProperties - - Add to page - Προσθήκη σε σελίδα - - - Set as background - Ορισμός ως παρασκήνιο - - - Add to library - Προσθήκη στη βιβλιοθήκη - - - Object informations - Πληροφορίες αντικειμένου - - - - UBLibraryController - - Added 1 Image to Library - Μία εικόνα προστέθηκε στη βιβλιοθήκη - - - Audios - Audio category element - Ήχοι - - - Movies - Movies category element - Ταινίες - - - Pictures - Pictures category element - Εικόνες - - - Shapes - Shapes category element - Σχήματα - - - Applications - Applications category element - Εφαρμογές - - - Favorite - Favorite category element - Αγαπημένο - - - Creating image thumbnail for %1. - Δημιουργία μικρογραφίας για το %1 - - - Adding to page failed for item %1. - Η εισαγωγή του αντικειμένου %1 στη σελίδα απέτυχε - - - Interactivities - Interactives category element - Διαδραστικά εφαρμογίδια - - - ImportedImage - Εισηγμένη εικόνα - - - Animations - Animations category element - Κινούμενες αποτυπώσεις - - - Web Search - Web search category element - Αναζήτηση Διαδικτύου - - UBMainWindow @@ -1698,6 +1655,13 @@ Εντάξει + + UBMessagesDialog + + Close + + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Do you want to ignore these errors for this host? Όχι - - UBNewFolderDlg - - Add new folder - Προσθήκη νέου φακέλου - - - New Folder name: - Όνομα νέου φακέλου: - - - Add - Προσθήκη - - - Cancel - Άκυρο - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Do you want to ignore these errors for this host? My Movies Οι ταινίες μου + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Please reboot the application to access the updated documents. Υπενθύμιση αργότερα - - UBW3CWidget - - Web - Διαδίκτυο - - UBWebPluginWidget diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 71c54e5e..5220e2fe 100644 --- a/resources/i18n/sankore_en.ts +++ b/resources/i18n/sankore_en.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,20 +865,11 @@ QObject - Trash - Pictures category element + Element ID = - /Home - Category list label on navigation tool bar - - - - - UBAbstractWidget - - Loading ... + Content is not supported in destination format. @@ -942,6 +933,18 @@ Unknown content type %1 + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,11 +1167,19 @@ - Importing page %1 of %2 + Inserting page %1 of %2 + + + + Import successful. + + + + Importing file - Erronous image data, skipping file %1 + Import of file %1 successful. @@ -1242,6 +1253,13 @@ + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage + + Audios + + + + Movies + + + + Pictures + + + + Animations + + + + Interactivities + + + + Applications + + + + Shapes + + + + Favorites + + + + Web search + + + + Trash + + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( - - Image import failed. - - - - Image import successful. - - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 - - PDF import successful. - - UBIntranetPodcastPublisher @@ -1568,131 +1639,24 @@ - UBLibActionBar - - Add to favorites - - - - Share - - - - Search - - - - Delete - - - - Back to folder - - - - Remove from favorites - - - - Create new folder - - - - - UBLibItemProperties - - Add to page - - - - Set as background - - - - Add to library - - - - Object informations - - - - - UBLibraryController - - Added 1 Image to Library - - - - Audios - Audio category element - - - - Movies - Movies category element - - - - Pictures - Pictures category element - - - - Shapes - Shapes category element - - - - Applications - Applications category element - - - - Favorite - Favorite category element - - - - Creating image thumbnail for %1. - - - - Adding to page failed for item %1. - - - - Interactivities - Interactives category element - - + UBMainWindow - ImportedImage + Yes - Animations - Animations category element + No - Web Search - Web search category element + Ok - UBMainWindow - - Yes - - + UBMessagesDialog - No - - - - Ok + Close @@ -1725,25 +1689,6 @@ Do you want to ignore these errors for this host? - - UBNewFolderDlg - - Add new folder - - - - New Folder name: - - - - Add - - - - Cancel - - - UBPersistenceManager @@ -1904,6 +1849,14 @@ Do you want to ignore these errors for this host? My Movies + + Group + + + + Ungroup + + UBTGActionWidget @@ -2181,13 +2134,6 @@ Please reboot the application to access the updated documents. - - UBW3CWidget - - Web - - - UBWebPluginWidget diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index 5e6e2cf9..965b26b9 100644 --- a/resources/i18n/sankore_en_UK.ts +++ b/resources/i18n/sankore_en_UK.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,20 +865,11 @@ QObject - Trash - Pictures category element + Element ID = - /Home - Category list label on navigation tool bar - - - - - UBAbstractWidget - - Loading ... + Content is not supported in destination format. @@ -942,6 +933,18 @@ All Supported (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,11 +1167,19 @@ - Importing page %1 of %2 + Inserting page %1 of %2 + + + + Import successful. + + + + Importing file - Erronous image data, skipping file %1 + Import of file %1 successful. @@ -1242,6 +1253,13 @@ + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage + + Audios + + + + Movies + + + + Pictures + + + + Animations + + + + Interactivities + + + + Applications + + + + Shapes + + + + Favorites + + + + Web search + + + + Trash + + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( - - Image import failed. - - - - Image import successful. - - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 - - PDF import successful. - - UBIntranetPodcastPublisher @@ -1568,131 +1639,24 @@ - UBLibActionBar - - Add to favorites - - - - Share - - - - Search - - - - Delete - - - - Back to folder - - - - Remove from favorites - - - - Create new folder - - - - - UBLibItemProperties - - Add to page - - - - Set as background - - - - Add to library - - - - Object informations - - - - - UBLibraryController - - Added 1 Image to Library - - - - Audios - Audio category element - - - - Movies - Movies category element - - - - Pictures - Pictures category element - - - - Shapes - Shapes category element - - - - Applications - Applications category element - - - - Favorite - Favorite category element - - - - Creating image thumbnail for %1. - - - - Adding to page failed for item %1. - - - - Interactivities - Interactives category element - - + UBMainWindow - ImportedImage + Yes - Animations - Animations category element + No - Web Search - Web search category element + Ok - UBMainWindow - - Yes - - + UBMessagesDialog - No - - - - Ok + Close @@ -1725,25 +1689,6 @@ Do you want to ignore these errors for this host? - - UBNewFolderDlg - - Add new folder - - - - New Folder name: - - - - Add - - - - Cancel - - - UBPersistenceManager @@ -1904,6 +1849,14 @@ Do you want to ignore these errors for this host? My Movies + + Group + + + + Ungroup + + UBTGActionWidget @@ -2181,13 +2134,6 @@ Please reboot the application to access the updated documents. - - UBW3CWidget - - Web - - - UBWebPluginWidget diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index bfbe6287..09046e96 100644 --- a/resources/i18n/sankore_es.ts +++ b/resources/i18n/sankore_es.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importar viejos documentos de Sankore o Uniboard - - Group Items - Agrupar Elementos - Group items Agrupar elementos @@ -823,6 +819,10 @@ Remove the backgound Eliminar el fondo + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Papelera - - - /Home - Category list label on navigation tool bar - /Inicio + Element ID = + - - - UBAbstractWidget - Loading ... - Cargando... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Todos compatibles (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Archivo %1 guardado - Importing page %1 of %2 - Importando página %1 de %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Datos de imagen erróneos, archivo omitido %1 + Import successful. + Importación satisfactoria. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Cancelar + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Imagen importada + + Audios + Audios + + + Movies + Películas + + + Pictures + Imágenes + + + Animations + Animaciones + + + Interactivities + Interactividades + + + Applications + Aplicaciones + + + Shapes + Formas + + + Favorites + + + + Web search + + + + Trash + Papelera + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Editable + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Cargando... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Formato de imagen ( - - Image import failed. - Fallo de la importación de la imagen. - - - Image import successful. - Importación de imagen satisfactoria. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importando página %1 de %2 - - PDF import successful. - Importación de PDF satisfactoria. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Entrar - - UBLibActionBar - - Add to favorites - Añadir a favoritos - - - Share - Compartir - - - Search - Buscar - - - Delete - Eliminar - - - Back to folder - Regresar a la carpeta - - - Remove from favorites - Eliminar de favoritos - - - Create new folder - Crear nueva carpeta - - - - UBLibItemProperties - - Add to page - Añadir a la página - - - Set as background - Definir como fondo - - - Add to library - Añadir a biblioteca - - - Object informations - Información del objeto - - - - UBLibraryController - - Added 1 Image to Library - Se añadió una imagen a la biblioteca - - - Audios - Audio category element - Audios - - - Movies - Movies category element - Películas - - - Pictures - Pictures category element - Imágenes - - - Shapes - Shapes category element - Formas - - - Applications - Applications category element - Aplicaciones - - - Favorite - Favorite category element - Favorito - - - Creating image thumbnail for %1. - Creando miniatura de imagen para %1. - - - Adding to page failed for item %1. - La adición a la página falló para el elemento %1. - - - Interactivities - Interactives category element - Interactividades - - - ImportedImage - Imagen importada - - - Animations - Animations category element - Animaciones - - - Web Search - Web search category element - Buscade en la Web - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Cerrar + + UBNetworkAccessManager @@ -1727,25 +1691,6 @@ Do you want to ignore these errors for this host? No - - UBNewFolderDlg - - Add new folder - Añadir nueva carpeta - - - New Folder name: - Nombre de la nueva carpeta: - - - Add - Añadir - - - Cancel - Cancelar - - UBPersistenceManager @@ -1906,6 +1851,14 @@ Do you want to ignore these errors for this host? My Movies Mis películas + + Group + + + + Ungroup + + UBTGActionWidget @@ -2184,13 +2137,6 @@ Por favor, reinicie la aplicación para acceder a los documentos actualizados.Recordarme más tarde - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index f048294f..e34a8584 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importer les anciens documents Sankoré ou Uniboard - - Group Items - Grouper - Group items Grouper @@ -823,6 +819,10 @@ Remove the backgound Supprimer le fond + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Corbeille - - - /Home - Category list label on navigation tool bar - /Accueil + Element ID = + - - - UBAbstractWidget - Loading ... - Chargement en cours ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ Unknown content type %1 Type de contenu inconnu (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1161,16 +1164,24 @@ Tous les fichiers supportés (*.%1) - Importing page %1 of %2 - Importation de la page %1 sur %2 + File %1 saved + Fichier %1 sauvé - Erronous image data, skipping file %1 - Format d'image erroné, le fichier %1 n'a pas été traité + Inserting page %1 of %2 + - File %1 saved - Fichier %1 sauvé + Import successful. + Importation terminée. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Annuler + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Image importée + + Audios + Sons + + + Movies + Vidéos + + + Pictures + Images + + + Animations + Animations + + + Interactivities + Interactivités + + + Applications + Applications + + + Shapes + Formes + + + Favorites + + + + Web search + + + + Trash + Corbeille + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Éditable + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Chargement en cours ... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Format d'image ( - - Image import failed. - Échec de l'importation de l'image. - - - Image import successful. - Importation de l'image réussie. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importation de la page %1 sur %2 - - PDF import successful. - Importation PDF réussie. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Retour - - UBLibActionBar - - Add to favorites - Ajouter aux favoris - - - Share - Partager - - - Search - Rechercher - - - Delete - Supprimer - - - Back to folder - Retour au répertoire - - - Remove from favorites - Supprimer des favoris - - - Create new folder - Créer un nouveau dossier - - - - UBLibItemProperties - - Add to page - Ajout à la page - - - Set as background - Ajout en fond - - - Add to library - Ajout à la bibliothèque - - - Object informations - Informations - - - - UBLibraryController - - Added 1 Image to Library - 1 image ajoutée à la bibliothèque - - - Audios - Audio category element - Sons - - - Movies - Movies category element - Vidéos - - - Pictures - Pictures category element - Images - - - Shapes - Shapes category element - Formes - - - Applications - Applications category element - Applications - - - Favorite - Favorite category element - Favoris - - - Creating image thumbnail for %1. - Création de la vignette pour %1. - - - Adding to page failed for item %1. - Impossible d'ajouter %1 à la page courante. - - - Interactivities - Interactives category element - Interactivités - - - ImportedImage - Image importée - - - Animations - Animations category element - Animations - - - Web Search - Web search category element - Recherche Web - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Fermer + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Non - - UBNewFolderDlg - - Add new folder - Ajouter un nouveau dossier - - - New Folder name: - Nom du dossier : - - - Add - Ajouter - - - Cancel - Annuler - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Voulez-vous ignorer les erreurs pour ce serveur ? My Movies Mes films + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Me le rappeler plus tard - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index f048294f..e34a8584 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importer les anciens documents Sankoré ou Uniboard - - Group Items - Grouper - Group items Grouper @@ -823,6 +819,10 @@ Remove the backgound Supprimer le fond + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Corbeille - - - /Home - Category list label on navigation tool bar - /Accueil + Element ID = + - - - UBAbstractWidget - Loading ... - Chargement en cours ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ Unknown content type %1 Type de contenu inconnu (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1161,16 +1164,24 @@ Tous les fichiers supportés (*.%1) - Importing page %1 of %2 - Importation de la page %1 sur %2 + File %1 saved + Fichier %1 sauvé - Erronous image data, skipping file %1 - Format d'image erroné, le fichier %1 n'a pas été traité + Inserting page %1 of %2 + - File %1 saved - Fichier %1 sauvé + Import successful. + Importation terminée. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Annuler + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Image importée + + Audios + Sons + + + Movies + Vidéos + + + Pictures + Images + + + Animations + Animations + + + Interactivities + Interactivités + + + Applications + Applications + + + Shapes + Formes + + + Favorites + + + + Web search + + + + Trash + Corbeille + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Éditable + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Chargement en cours ... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Format d'image ( - - Image import failed. - Échec de l'importation de l'image. - - - Image import successful. - Importation de l'image réussie. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importation de la page %1 sur %2 - - PDF import successful. - Importation PDF réussie. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Retour - - UBLibActionBar - - Add to favorites - Ajouter aux favoris - - - Share - Partager - - - Search - Rechercher - - - Delete - Supprimer - - - Back to folder - Retour au répertoire - - - Remove from favorites - Supprimer des favoris - - - Create new folder - Créer un nouveau dossier - - - - UBLibItemProperties - - Add to page - Ajout à la page - - - Set as background - Ajout en fond - - - Add to library - Ajout à la bibliothèque - - - Object informations - Informations - - - - UBLibraryController - - Added 1 Image to Library - 1 image ajoutée à la bibliothèque - - - Audios - Audio category element - Sons - - - Movies - Movies category element - Vidéos - - - Pictures - Pictures category element - Images - - - Shapes - Shapes category element - Formes - - - Applications - Applications category element - Applications - - - Favorite - Favorite category element - Favoris - - - Creating image thumbnail for %1. - Création de la vignette pour %1. - - - Adding to page failed for item %1. - Impossible d'ajouter %1 à la page courante. - - - Interactivities - Interactives category element - Interactivités - - - ImportedImage - Image importée - - - Animations - Animations category element - Animations - - - Web Search - Web search category element - Recherche Web - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Fermer + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Non - - UBNewFolderDlg - - Add new folder - Ajouter un nouveau dossier - - - New Folder name: - Nom du dossier : - - - Add - Ajouter - - - Cancel - Annuler - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Voulez-vous ignorer les erreurs pour ce serveur ? My Movies Mes films + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Me le rappeler plus tard - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index 2ee5af5e..94928639 100644 --- a/resources/i18n/sankore_it.ts +++ b/resources/i18n/sankore_it.ts @@ -1,4 +1,6 @@ - + + + BlackoutWidget @@ -765,27 +767,27 @@ Ctrl+H Ctrl+H - + Open-Sankoré Open-Sankoré - + Quit Open-Sankoré Chiudi Open-Sankoré - + Open-Sankoré Editor Editore Open-Sankoré - + Show Open-Sankoré Widgets Editor Mostra l'editore dei Widgets Open-Sankoré - + Hide Open-Sankoré Nascondi Open-Sankoré - + Hide Open-Sankoré Application Nascondi l'applicazione Open-Sankoré @@ -797,10 +799,6 @@ Import old Sankore or Uniboard documents Importa i vecchi documenti Sankoré o Uniboard - - Group Items - Raggruppa - Group items Raggruppa gli oggetti selezionati @@ -821,6 +819,10 @@ Remove the backgound Rimuove lo sfondo + + Group + + PasswordDialog @@ -863,21 +865,12 @@ QObject - Trash - Pictures category element - Cestino + Element ID = + - /Home - Category list label on navigation tool bar - /Home - - - - UBAbstractWidget - - Loading ... - Caricamento in corso... + Content is not supported in destination format. + @@ -940,6 +933,18 @@ All Supported (%1) Tutto supportato (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1124,10 +1129,12 @@ The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed? Il documento '%1' è stato generato con una versione più recente di Sankore (%2). Aprendolo, si potrebbero perdere alcune informazioni. Vuoi continuare? - + Are you sure you want to remove %n page(s) from the selected document '%1'? - + + Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezionato? + @@ -1162,12 +1169,20 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion File %1 salvato - Importing page %1 of %2 - Sto importando pagina %1 di %2 + Inserting page %1 of %2 + + + + Import successful. + Importazione completata con successo. + + + Importing file + - Erronous image data, skipping file %1 - Dati dell'immagine errati, salto il file %1 + Import of file %1 successful. + @@ -1222,10 +1237,12 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Copying page %1/%2 Sto copiando pagina %1/%2 - + %1 pages copied - %1 pagine copiate + + %1 pagine copiate + @@ -1240,6 +1257,13 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Annulla + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1419,6 +1443,53 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion ImportedImage Immagine importata + + Audios + Audio + + + Movies + Film + + + Pictures + Immagini + + + Animations + Animazioni + + + Interactivities + Interattività + + + Applications + Applicazioni + + + Shapes + Forme + + + Favorites + + + + Web search + + + + Trash + Cestino + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1453,6 +1524,24 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Modificabile + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Caricamento in corso... + + UBGraphicsWidgetItemDelegate @@ -1512,14 +1601,6 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Image Format ( Formato immagine ( - - Image import failed. - Importazione immagine fallita. - - - Image import successful. - Immagine importata con successo. - UBImportPDF @@ -1535,10 +1616,6 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Importing page %1 of %2 Importazione della pagina %1 di %2 in corso - - PDF import successful. - Importazione del PDF completata con successo. - UBIntranetPodcastPublisher @@ -1565,120 +1642,6 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Invio - - UBLibActionBar - - Add to favorites - Aggiungi ai preferiti - - - Share - Condividi - - - Search - Cerca - - - Delete - Cancella - - - Back to folder - Torna alla cartella - - - Remove from favorites - Rimuovi dai preferiti - - - Create new folder - Crea nuova cartella - - - - UBLibItemProperties - - Add to page - Aggiungi alla pagina - - - Set as background - Imposta come sfondo - - - Add to library - Aggiungi alla Biblioteca - - - Object informations - Informazioni sull'oggetto - - - - UBLibraryController - - Added 1 Image to Library - Aggiungi un'immagine alla Biblioteca - - - Audios - Audio category element - Audio - - - Movies - Movies category element - Film - - - Pictures - Pictures category element - Immagini - - - Shapes - Shapes category element - Forme - - - Applications - Applications category element - Applicazioni - - - Favorite - Favorite category element - Preferiti - - - Creating image thumbnail for %1. - Generazione della miniatura di anteprima per %1 in corso. - - - Adding to page failed for item %1. - L'aggiunta alla pagina per l'elemento %1 è fallita. - - - Interactivities - Interactives category element - Interattività - - - ImportedImage - Immagine importata - - - Animations - Animations category element - Animazioni - - - Web Search - Web search category element - Ricerca Web - - UBMainWindow @@ -1694,6 +1657,13 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Ok + + UBMessagesDialog + + Close + Chiudi + + UBNetworkAccessManager @@ -1729,25 +1699,6 @@ Vuoi ignorare gli errori per questo host? No - - UBNewFolderDlg - - Add new folder - Aggiungi nuova cartella - - - New Folder name: - Nome nuova cartella: - - - Add - Aggiungi - - - Cancel - Annulla - - UBPersistenceManager @@ -1908,6 +1859,14 @@ Vuoi ignorare gli errori per questo host? My Movies I miei film + + Group + + + + Ungroup + + UBTGActionWidget @@ -2189,13 +2148,6 @@ Si prega di riavviare l'applicazione per accedere ai documenti aggiornati.< Ricordamelo in seguito - - UBW3CWidget - - Web - Web - - UBWebPluginWidget @@ -2661,7 +2613,7 @@ p, li { white-space: pre-wrap; } Preferences Preferenze - + version : … versione: ... @@ -2769,7 +2721,7 @@ p, li { white-space: pre-wrap; } Network Rete - + Open-Sankoré Open-Sankoré @@ -2809,7 +2761,7 @@ p, li { white-space: pre-wrap; } Pass: Password: - + Planète Sankoré ID ID Planete Sankoré @@ -3295,7 +3247,7 @@ p, li { white-space: pre-wrap; } Credits Crediti - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -3315,7 +3267,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index 23a5af9b..6edd9eb1 100644 --- a/resources/i18n/sankore_iw.ts +++ b/resources/i18n/sankore_iw.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents ייבא מסמכים ישנים של Sankoré או של Uniboard - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - /Home - Category list label on navigation tool bar - /דף הבית - - - Trash - Pictures category element - סל אשפה + Element ID = + - - - UBAbstractWidget - Loading ... - טוען... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) הכל )%1( + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ קובץ %1 נשמר - Importing page %1 of %2 - מייבא עמוד %1 מתוך %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - נותני תמונה שגויים, מדלג על הקובץ %1 + Import successful. + הייבוא בוצע בהצלחה. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ בטל + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage תמונה מיובאת + + Audios + קבצי שמע + + + Movies + סרטים + + + Pictures + תמונות + + + Animations + אנימציות + + + Interactivities + אינטראקטיביות + + + Applications + יישומים + + + Shapes + צורות + + + Favorites + + + + Web search + + + + Trash + + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ ניתן לעריכה + + UBGraphicsW3CWidgetItem + + Web + אינטרנט + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + טוען... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( פורמט התמונה ) - - Image import failed. - ייבוא התמונה נכשל. - - - Image import successful. - ייבוא התמונה בוצע בהצלחה. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 מייבא עמוד %1 מתוך %2 - - PDF import successful. - ייבוא ה- PDF בוצע בהצלחה. - UBIntranetPodcastPublisher @@ -1570,120 +1641,6 @@ מקש ה= ENTER - - UBLibActionBar - - Add to favorites - הוסף למועדפים - - - Share - שתף - - - Search - חפש - - - Delete - מחק - - - Back to folder - חזרה לקובץ - - - Remove from favorites - הסר מהמועדפים - - - Create new folder - צור תיקייה חדשה - - - - UBLibItemProperties - - Add to page - הוסף לדף - - - Set as background - קבע כרקע - - - Add to library - הוסף לספרייה - - - Object informations - מידע על האובייקט - - - - UBLibraryController - - ImportedImage - תמונה מיובאת - - - Added 1 Image to Library - תמונה 1 הוספה לספריה - - - Audios - Audio category element - קבצי שמע - - - Movies - Movies category element - סרטים - - - Pictures - Pictures category element - תמונות - - - Shapes - Shapes category element - צורות - - - Applications - Applications category element - יישומים - - - Favorite - Favorite category element - מועדף - - - Interactivities - Interactives category element - אינטראקטיביות - - - Animations - Animations category element - אנימציות - - - Creating image thumbnail for %1. - יוצר תמונה ממוזערת עבור %1. - - - Adding to page failed for item %1. - ההוספה לדף נכשלה עבור פריט %1. - - - Web Search - Web search category element - חיפוש באינטרנט - - UBMainWindow @@ -1699,6 +1656,13 @@ אישור + + UBMessagesDialog + + Close + סגור + + UBNetworkAccessManager @@ -1728,25 +1692,6 @@ Do you want to ignore these errors for this host? לא - - UBNewFolderDlg - - Add new folder - הוסף תיקיה חדשה - - - New Folder name: - שם תיקייה חדשה: - - - Add - הוסף - - - Cancel - בטל - - UBPersistenceManager @@ -1907,6 +1852,14 @@ Do you want to ignore these errors for this host? My Movies הסרטים שלי + + Group + + + + Ungroup + + UBTGActionWidget @@ -2185,13 +2138,6 @@ Please reboot the application to access the updated documents. לי שוב מאוחר יות - - UBW3CWidget - - Web - אינטרנט - - UBWebPluginWidget diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index f62813ac..96e15232 100644 --- a/resources/i18n/sankore_ja.ts +++ b/resources/i18n/sankore_ja.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents 古いSankore書類やUniboard書類を移入する - - Group Items - アイテムを纏める - Group items アイテムを纏める @@ -823,6 +819,10 @@ Remove the backgound 壁紙を削除する + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - ゴミ箱 - - - /Home - Category list label on navigation tool bar - /ホーム + Element ID = + - - - UBAbstractWidget - Loading ... - ローディング中… + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) 全てサポート(%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,12 +1167,20 @@ ファイル%1保存済み - Importing page %1 of %2 - %1 / %2 ページをインポート + Inserting page %1 of %2 + + + + Import successful. + インポートに成功。 + + + Importing file + - Erronous image data, skipping file %1 - 画像データエラー、ファイル%1をスキップ + Import of file %1 successful. + @@ -1242,6 +1253,13 @@ キャンセル + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage インポートされた画像 + + Audios + オーディオ + + + Movies + ムービー + + + Pictures + 写真 + + + Animations + 動画 + + + Interactivities + インタラクティブ + + + Applications + アプリケーション + + + Shapes + 形状 + + + Favorites + + + + Web search + + + + Trash + ゴミ箱 + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ 編集できます + + UBGraphicsW3CWidgetItem + + Web + ウェブ + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + ローディング中… + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( 画像フォーマット（ - - Image import failed. - 画像インポートに失敗 - - - Image import successful. - 画像インポートに成功 - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 %1 / %2 ページをインポート - - PDF import successful. - PDFインポートに成功 - UBIntranetPodcastPublisher @@ -1567,120 +1638,6 @@ Enter - - UBLibActionBar - - Add to favorites - お気に入りに追加 - - - Share - シェアする - - - Search - 検索 - - - Delete - 削除 - - - Back to folder - フォルダーに戻る - - - Remove from favorites - お気に入りから削除 - - - Create new folder - 新規フォルダーを作成 - - - - UBLibItemProperties - - Add to page - ページに追加 - - - Set as background - 背景として設定 - - - Add to library - ライブラリに追加 - - - Object informations - オブジェクトインフォーメーション - - - - UBLibraryController - - Added 1 Image to Library - ライブラリに1画像追加 - - - Audios - Audio category element - オーディオ - - - Movies - Movies category element - ムービー - - - Pictures - Pictures category element - 写真 - - - Shapes - Shapes category element - 形状 - - - Applications - Applications category element - アプリケーション - - - Favorite - Favorite category element - お気に入り - - - Creating image thumbnail for %1. - %1のサムネイル画像を作成 - - - Adding to page failed for item %1. - %1のページへの追加に失敗 - - - Interactivities - Interactives category element - インタラクティブ - - - ImportedImage - インポートされた画像 - - - Animations - Animations category element - 動画 - - - Web Search - Web search category element - ウエブに経験する - - UBMainWindow @@ -1696,6 +1653,13 @@ Ok + + UBMessagesDialog + + Close + 閉じる + + UBNetworkAccessManager @@ -1732,25 +1696,6 @@ Do you want to ignore these errors for this host? いいえ - - UBNewFolderDlg - - Add new folder - 新規フォルダー追加 - - - New Folder name: - 新規フォルダー名： - - - Add - 追加 - - - Cancel - キャンセル - - UBPersistenceManager @@ -1911,6 +1856,14 @@ Do you want to ignore these errors for this host? My Movies マイ・ムービー + + Group + + + + Ungroup + + UBTGActionWidget @@ -2189,13 +2142,6 @@ Please reboot the application to access the updated documents. あとで覚える - - UBW3CWidget - - Web - ウェブ - - UBWebPluginWidget diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index 481e8289..c5989f95 100644 --- a/resources/i18n/sankore_ko.ts +++ b/resources/i18n/sankore_ko.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - 휴지통 - - - /Home - Category list label on navigation tool bar - /홈 + Element ID = + - - - UBAbstractWidget - Loading ... - 불러오는 중 ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) 모든 지원 형식 (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,12 +1167,20 @@ %1 파일 저장됨 - Importing page %1 of %2 - %1/%2 페이지 가져오는 중 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - 잘못된 이미지 데이터, %1 파일 건너뜀 + Import successful. + 가져오기 완료. + + + Importing file + + + + Import of file %1 successful. + @@ -1242,6 +1253,13 @@ 취소 + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage 가져온 이미지 + + Audios + 오디오 + + + Movies + 동영상 + + + Pictures + 사진 + + + Animations + 애니메이션 + + + Interactivities + 대화형 작업 + + + Applications + 응용 프로그램 + + + Shapes + 도형 + + + Favorites + + + + Web search + + + + Trash + 휴지통 + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ + + UBGraphicsW3CWidgetItem + + Web + 웹 + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + 불러오는 중 ... + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( 이미지 형식 ( - - Image import failed. - 이미지 가져오기 실패. - - - Image import successful. - 이미지 가져오기 완료. - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 %1/%2 페이지 가져오는 중 - - PDF import successful. - PDF 가져오기 완료. - UBIntranetPodcastPublisher @@ -1567,120 +1638,6 @@ - - UBLibActionBar - - Add to favorites - 즐겨찾기에 추가 - - - Share - 공유 - - - Search - 검색 - - - Delete - 삭제 - - - Back to folder - 폴더로 돌아가기 - - - Remove from favorites - 즐겨찾기에서 제거 - - - Create new folder - 새 폴더 만들기 - - - - UBLibItemProperties - - Add to page - 페이지에 추가 - - - Set as background - 배경으로 지정 - - - Add to library - 라이브러리에 추가 - - - Object informations - 객체 정보 - - - - UBLibraryController - - Added 1 Image to Library - 라이브러리에 이미지 1개 추가됨 - - - Audios - Audio category element - 오디오 - - - Movies - Movies category element - 동영상 - - - Pictures - Pictures category element - 사진 - - - Shapes - Shapes category element - 도형 - - - Applications - Applications category element - 응용 프로그램 - - - Favorite - Favorite category element - 즐겨찾기 - - - Creating image thumbnail for %1. - %1의 이미지 썸네일 생성 중. - - - Adding to page failed for item %1. - %1 항목의 페이지 추가 실패. - - - Interactivities - Interactives category element - 대화형 작업 - - - ImportedImage - 가져온 이미지 - - - Animations - Animations category element - 애니메이션 - - - Web Search - Web search category element - - - UBMainWindow @@ -1696,6 +1653,13 @@ 확인 + + UBMessagesDialog + + Close + 닫기 + + UBNetworkAccessManager @@ -1731,25 +1695,6 @@ Do you want to ignore these errors for this host? 아니요 - - UBNewFolderDlg - - Add new folder - 새 폴더 추가 - - - New Folder name: - 새 폴더 이름: - - - Add - 추가 - - - Cancel - 취소 - - UBPersistenceManager @@ -1910,6 +1855,14 @@ Do you want to ignore these errors for this host? My Movies 내 동영상 + + Group + + + + Ungroup + + UBTGActionWidget @@ -2188,13 +2141,6 @@ Please reboot the application to access the updated documents. - - UBW3CWidget - - Web - 웹 - - UBWebPluginWidget diff --git a/resources/i18n/sankore_mg.ts b/resources/i18n/sankore_mg.ts index 9f2f092a..251d0230 100644 --- a/resources/i18n/sankore_mg.ts +++ b/resources/i18n/sankore_mg.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Hafaro ny rakitra Uniboard na ny rakitra Sankore taloha - - Group Items - Atokony ny zavatra - Group items Atokony ny zavatra @@ -823,6 +819,10 @@ Remove the backgound Esorina ny ao ambadika + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Daba - - - /Home - Category list label on navigation tool bar - /Fandraisana + Element ID = + - - - UBAbstractWidget - Loading ... - Maka ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ Unknown content type %1 Mpiatiny tsy fantatra karazana %1 + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -949,6 +952,10 @@ Error Adding Image to Library Fanampiana ny sary amin'ny tahirim-boky tsy nety + + CapturedImage + + UBCachePropertiesWidget @@ -1129,6 +1136,10 @@ + + Title page + + UBDocumentManager @@ -1157,12 +1168,20 @@ Rakitra %1 voaraikitra - Importing page %1 of %2 - Manafatra pejy %1 amin'ny %2 + Inserting page %1 of %2 + + + + Import successful. + Fanafarana nety. - Erronous image data, skipping file %1 - Misy tsy fetezana ilay sary, ajanona ilay rakitra %1 + Importing file + + + + Import of file %1 successful. + @@ -1171,6 +1190,10 @@ Page %0 Pejy %0 + + Title page + + UBDocumentPublisher @@ -1232,6 +1255,13 @@ Ajanony + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1400,6 +1430,10 @@ Create new folder Mamorona fitoeran-drakitra vaovao + + Rescan file system + + UBFeaturesController @@ -1407,6 +1441,53 @@ ImportedImage Sary Nafarana + + Audios + Feo + + + Movies + Sarimietsika + + + Pictures + Sary + + + Animations + Sary ahetsika + + + Interactivities + Fifandraisana + + + Applications + Rindran'asa + + + Shapes + Bika + + + Favorites + + + + Web search + + + + Trash + Daba + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1441,6 +1522,24 @@ Azo ovaina + + UBGraphicsW3CWidgetItem + + Web + Tranon-kala + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Maka ... + + UBGraphicsWidgetItemDelegate @@ -1500,14 +1599,6 @@ Image Format ( Andrefin'ilay sary ( - - Image import failed. - Fanafarana ny sary tsy nety. - - - Image import successful. - Fanafarana ny sary nety. - UBImportPDF @@ -1523,10 +1614,6 @@ Importing page %1 of %2 Manafatra pejy %1 amin'ny %2 - - PDF import successful. - Fanafarana ny PDF nety. - UBIntranetPodcastPublisher @@ -1553,120 +1640,6 @@ Hiditra - - UBLibActionBar - - Add to favorites - Ampiana amin'ny zavatra tena tiana - - - Share - Zaraina - - - Search - Hikaroka - - - Delete - Fafana - - - Back to folder - Hiverina amin'ny fitoeran-drakitra - - - Remove from favorites - Fafana amin'ny zavatra tena tiana - - - Create new folder - Mamorona fitoeran-drakitra vaovao - - - - UBLibItemProperties - - Add to page - Ampiana amin'ilay pejy - - - Set as background - Apetraka ho ambadika - - - Add to library - Ampiana amin'ny tahirim-boky - - - Object informations - Mombamomban'ny zavatra - - - - UBLibraryController - - Added 1 Image to Library - Sary 1 nampiana amin'ny tahirim-boky - - - Audios - Audio category element - Feo - - - Movies - Movies category element - Sarimietsika - - - Pictures - Pictures category element - Sary - - - Shapes - Shapes category element - Bika - - - Applications - Applications category element - Rindran'asa - - - Favorite - Favorite category element - Tena tiana - - - Creating image thumbnail for %1. - Mamorona kisarisary ho an'ny %1. - - - Adding to page failed for item %1. - Fanampiana amin'ilay pejy tsy nety ho an'ny %1. - - - Interactivities - Interactives category element - Fifandraisana - - - ImportedImage - Sary nafarana - - - Animations - Animations category element - Sary ahetsika - - - Web Search - Web search category element - Mpikaroka amin'ny tranon-kala - - UBMainWindow @@ -1682,6 +1655,13 @@ Ekena + + UBMessagesDialog + + Close + Hidio + + UBNetworkAccessManager @@ -1717,25 +1697,6 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao?Tsia - - UBNewFolderDlg - - Add new folder - Manampy fitoeran-drakitra vaovao - - - New Folder name: - Anaranan'ilay fitoerna-drakitra vaovao: - - - Add - Ampiana - - - Cancel - Ajanona - - UBPersistenceManager @@ -1896,6 +1857,14 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao?My Movies Ny sarimietsiko + + Group + + + + Ungroup + + UBTGActionWidget @@ -1966,10 +1935,6 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao? UBTeacherGuidePageZeroWidget - - Page 0 - Pejy 0 - Type session title here ... Sorato eto ny lahatenin'ny fifandraisana manokana ... @@ -2060,6 +2025,10 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao? Noavoazana ny: + + Title page + + UBTeacherGuidePresentationWidget @@ -2174,13 +2143,6 @@ Avereno alefa ny rindr'asa ahafahana mampiasa ny rakitra novoazana azafady. Ampatsiahivo ana amin'ny manaraka - - UBW3CWidget - - Web - Tranon-kala - - UBWebPluginWidget @@ -3719,6 +3681,10 @@ p, li { white-space: pre-wrap; } <td style="border: none;"> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-size:12pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-size:9pt;"> </span></p></td></tr></table></body></html> + + Credits + Voaka + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -3727,39 +3693,54 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Interêt Public Education Numerique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - - - Credits - Voaka +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:12pt; font-weight:600;">Fonts</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Thanks to Henri ROGELET for Script-École 2, ScriptCase-École, Alphonetic (</span><a href="http://pointecole.free.fr/polices.html"><span style=" font-family:'Arial'; text-decoration: underline; color:#0000ff;">http://pointecole.free.fr/polices.html</span></a><span style=" font-family:'Arial';">).</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Andika Copyright (c) 2004-2011, SIL International (http://www.sil.org/). Licensed under the SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL), with Reserved Font Names &quot;Andika&quot; and &quot;SIL&quot;.</span></p> -<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; color:#000000;">- Ecolier CC BY-NC-ND 2.0 (JM Douteau)</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:12pt; font-weight:600;">Fonts</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Thanks to Henri ROGELET for Script-École 2, ScriptCase-École, Alphonetic (</span><a href="http://pointecole.free.fr/polices.html"><span style=" font-family:'Arial'; text-decoration: underline; color:#0000ff;">http://pointecole.free.fr/polices.html</span></a><span style=" font-family:'Arial';">).</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial';">- Andika Copyright (c) 2004-2011, SIL International (http://www.sil.org/). Licensed under the SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL), with Reserved Font Names &quot;Andika&quot; and &quot;SIL&quot;.</span></p> -<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; color:#000000;">- Ecolier CC BY-NC-ND 2.0 (JM Douteau)</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Crédits police scolaire Open-Sankoré : </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police Andika Basic dispose d'une licence Open Font License </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Sil international</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Court </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Ligne Court</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier lignes pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p></body></html> + diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index df2c4bb1..cf929c08 100644 --- a/resources/i18n/sankore_nb.ts +++ b/resources/i18n/sankore_nb.ts @@ -801,10 +801,6 @@ Import old Sankore or Uniboard documents Importer gamle Sankore eller Uniboard-dokumenter - - Group Items - - Group items @@ -825,6 +821,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -867,21 +867,12 @@ QObject - Trash - Pictures category element - Søppel - - - /Home - Category list label on navigation tool bar - /Hjem + Element ID = + - - - UBAbstractWidget - Loading ... - Laster ... + Content is not supported in destination format. + @@ -944,6 +935,18 @@ All Supported (%1) Alle støttede (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1168,12 +1171,20 @@ Fil %1 lagret - Importing page %1 of %2 - Importerer side %1 av %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Feil bildedata, ignorerer fil %1 + Import successful. + Importering gjennomført. + + + Importing file + + + + Import of file %1 successful. + @@ -1247,6 +1258,13 @@ Avbryt + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1426,6 +1444,53 @@ ImportedImage Importert bilde + + Audios + Lydfiler + + + Movies + Filmer + + + Pictures + Bilder + + + Animations + Animasjoner + + + Interactivities + Interaktivitet + + + Applications + Applikasjoner + + + Shapes + Former + + + Favorites + + + + Web search + + + + Trash + Søppel + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1460,6 +1525,24 @@ Redigerbar + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Laster ... + + UBGraphicsWidgetItemDelegate @@ -1519,14 +1602,6 @@ Image Format ( Bildeformat ( - - Image import failed. - Importering av bilde mislyktes. - - - Image import successful. - Importering av bilde gjennomført. - UBImportPDF @@ -1542,10 +1617,6 @@ Importing page %1 of %2 Importerer side %1 av %2 - - PDF import successful. - Importering av bilde gjennomført. - UBIntranetPodcastPublisher @@ -1573,120 +1644,6 @@ Enter - - UBLibActionBar - - Add to favorites - Legg til favoritter - - - Share - Del - - - Search - Søk - - - Delete - Slett - - - Back to folder - Tilbake til mappe - - - Remove from favorites - Fjern fra favoritter - - - Create new folder - Opprett ny mappe - - - - UBLibItemProperties - - Add to page - Legg til side - - - Set as background - Bruk som bakgrunn - - - Add to library - Legg til bibliotek - - - Object informations - Objektopplysninger - - - - UBLibraryController - - Added 1 Image to Library - 1 bilde lagt til i biblioteket - - - Audios - Audio category element - Lydfiler - - - Movies - Movies category element - Filmer - - - Pictures - Pictures category element - Bilder - - - Shapes - Shapes category element - Former - - - Applications - Applications category element - Applikasjoner - - - Favorite - Favorite category element - Favoritt - - - Creating image thumbnail for %1. - Oppretter miniatyrbilde for %1. - - - Adding to page failed for item %1. - Enhet %1 kunne ikke legges til bilde. - - - Interactivities - Interactives category element - Interaktivitet - - - ImportedImage - Importert bilde - - - Animations - Animations category element - Animasjoner - - - Web Search - Web search category element - Nettsøk - - UBMainWindow @@ -1702,6 +1659,13 @@ Ok + + UBMessagesDialog + + Close + Avslutt + + UBNetworkAccessManager @@ -1731,25 +1695,6 @@ Do you want to ignore these errors for this host? Nei - - UBNewFolderDlg - - Add new folder - Legg til ny mappe - - - New Folder name: - Ny mappes navn: - - - Add - Legg - - - Cancel - Kanseller - - UBPersistenceManager @@ -1910,6 +1855,14 @@ Do you want to ignore these errors for this host? My Movies Mine filmer + + Group + + + + Ungroup + + UBTGActionWidget @@ -2187,13 +2140,6 @@ Please reboot the application to access the updated documents. Minn meg på det senere - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index 21eea083..c64bd765 100644 --- a/resources/i18n/sankore_nl.ts +++ b/resources/i18n/sankore_nl.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importeer oude Sankoré of Uniboarddocumenten - - Group Items - Groep onderdelen - Group items groep onderdelen @@ -823,6 +819,10 @@ Remove the backgound Achtyergrond verwijderen + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Prullenbak - - - /Home - Category list label on navigation tool bar - /Homepage + Element ID = + - - - UBAbstractWidget - Loading ... - Wordt geladen... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Alle ondersteunden (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Bestand %1 opgeslagen - Importing page %1 of %2 - Pagina %1 op %2 wordt geïmporteerd + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Fout in beeldgegevens, bestand %1 wordt overgeslagen + Import successful. + Import gelukt. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Annuleren + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Geïmporteerd beeld + + Audios + Audio's + + + Movies + Films + + + Pictures + Foto's + + + Animations + Animaties + + + Interactivities + Interactiviteiten + + + Applications + Toepassingen + + + Shapes + Vormen + + + Favorites + + + + Web search + + + + Trash + Prullenbak + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Bewerkbaar + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Wordt geladen... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Beeldformaat ( - - Image import failed. - Beeld import mislukt. - - - Image import successful. - Beeld import gelukt. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importering van pagina %1 van %2 gelukt - - PDF import successful. - PDF import gelukt. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Enter - - UBLibActionBar - - Add to favorites - Aan favorieten toevoegen - - - Share - Delen - - - Search - Zoeken - - - Delete - Verwijderen - - - Back to folder - Terug naar map - - - Remove from favorites - Uit favorieten verwijderen - - - Create new folder - Nieuwe map maken - - - - UBLibItemProperties - - Add to page - Aan pagina toevoegen - - - Set as background - Als achtergrond gebruiken - - - Add to library - Aan bibliotheek toevoegen - - - Object informations - Object informatie - - - - UBLibraryController - - Added 1 Image to Library - 1 beeld aan bibliotheek toegevoegd - - - Audios - Audio category element - Audio's - - - Movies - Movies category element - Films - - - Pictures - Pictures category element - Foto's - - - Shapes - Shapes category element - Vormen - - - Applications - Applications category element - Toepassingen - - - Favorite - Favorite category element - Favoriet - - - Creating image thumbnail for %1. - Miniatuur maken voor %1. - - - Adding to page failed for item %1. - Item %1 is niet aan pagina toegevoegd. - - - Interactivities - Interactives category element - Interactiviteiten - - - ImportedImage - Geïmporteerd beeld - - - Animations - Animations category element - Animaties - - - Web Search - Web search category element - Web zoekopdracht - - UBMainWindow @@ -1698,6 +1655,13 @@ OK + + UBMessagesDialog + + Close + Sluiten + + UBNetworkAccessManager @@ -1727,25 +1691,6 @@ Do you want to ignore these errors for this host? Nee - - UBNewFolderDlg - - Add new folder - Nieuwe map toevoegen - - - New Folder name: - Nieuwe mapnaam: - - - Add - Toevoegen - - - Cancel - Annuleren - - UBPersistenceManager @@ -1906,6 +1851,14 @@ Do you want to ignore these errors for this host? My Movies Mijn films + + Group + + + + Ungroup + + UBTGActionWidget @@ -2183,13 +2136,6 @@ Please reboot the application to access the updated documents. - - UBW3CWidget - - Web - Internet - - UBWebPluginWidget diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index 36b67b67..9b5026ff 100644 --- a/resources/i18n/sankore_pl.ts +++ b/resources/i18n/sankore_pl.ts @@ -803,10 +803,6 @@ Import old Sankore or Uniboard documents Importuj stare dokumenty Sankore lub Uniboard - - Group Items - - Group items @@ -827,6 +823,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -869,21 +869,12 @@ QObject - Trash - Pictures category element - Kosz - - - /Home - Category list label on navigation tool bar - /Strona główna + Element ID = + - - - UBAbstractWidget - Loading ... - Wczytywanie... + Content is not supported in destination format. + @@ -946,6 +937,18 @@ All Supported (%1) Wszystkie obsługiwane (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1170,12 +1173,20 @@ Plik %1 zapisany - Importing page %1 of %2 - Importowanie strony %1 z %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Błędne dane obrazu. Pomijanie pliku %1 + Import successful. + Importowanie zakończone powodzeniem. + + + Importing file + + + + Import of file %1 successful. + @@ -1251,6 +1262,13 @@ Anuluj + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1430,6 +1448,53 @@ ImportedImage ImportowanyObraz + + Audios + Nagrania + + + Movies + Filmy + + + Pictures + Obrazy + + + Animations + Animacje + + + Interactivities + Interakcje + + + Applications + Aplikacje + + + Shapes + Kształty + + + Favorites + + + + Web search + + + + Trash + Kosz + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1464,6 +1529,24 @@ Edytowalne + + UBGraphicsW3CWidgetItem + + Web + Sieć Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Wczytywanie... + + UBGraphicsWidgetItemDelegate @@ -1523,14 +1606,6 @@ Image Format ( Format obrazu ( - - Image import failed. - Importowanie obrazu zakończone niepowodzeniem. - - - Image import successful. - Importowanie obrazu zakończone powodzeniem. - UBImportPDF @@ -1546,10 +1621,6 @@ Importing page %1 of %2 Importowanie strony %1 z %2 - - PDF import successful. - Importowanie PDF zakończone powodzeniem. - UBIntranetPodcastPublisher @@ -1576,120 +1647,6 @@ Enter - - UBLibActionBar - - Add to favorites - Dodaj do ulubionych - - - Share - Udostępniaj - - - Search - Szukaj - - - Delete - Usuń - - - Back to folder - Powrót do folderu - - - Remove from favorites - Usuń z ulubionych - - - Create new folder - Utwórz nowy folder - - - - UBLibItemProperties - - Add to page - Dodaj do strony - - - Set as background - Ustaw jako tło - - - Add to library - Dodaj do biblioteki - - - Object informations - Informacje o obiekcie - - - - UBLibraryController - - Added 1 Image to Library - Dodano 1 obraz do biblioteki - - - Audios - Audio category element - Nagrania - - - Movies - Movies category element - Filmy - - - Pictures - Pictures category element - Obrazy - - - Shapes - Shapes category element - Kształty - - - Applications - Applications category element - Aplikacje - - - Favorite - Favorite category element - Ulubione - - - Creating image thumbnail for %1. - Tworzenie miniatury obrazu dla %1. - - - Adding to page failed for item %1. - Dodawanie do strony zakończone niepowodzeniem dla elementu %1. - - - Interactivities - Interactives category element - Interakcje - - - ImportedImage - ImportowanyObraz - - - Animations - Animations category element - Animacje - - - Web Search - Web search category element - Wyszukiwanie w sieci - - UBMainWindow @@ -1705,6 +1662,13 @@ Ok + + UBMessagesDialog + + Close + Zamknij + + UBNetworkAccessManager @@ -1740,25 +1704,6 @@ Czy chcesz ignorować te błędy dla tego hosta? Nie - - UBNewFolderDlg - - Add new folder - Dodaj nowy folder - - - New Folder name: - Nazwa nowego folderu: - - - Add - Dodaj - - - Cancel - Anuluj - - UBPersistenceManager @@ -1919,6 +1864,14 @@ Czy chcesz ignorować te błędy dla tego hosta? My Movies Moje filmy + + Group + + + + Ungroup + + UBTGActionWidget @@ -2197,13 +2150,6 @@ Aby uzyskać dostęp do zaktualizowanych dokumentów, należy ponownie uruchomi Przypomnij mi później - - UBW3CWidget - - Web - Sieć Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index 32fecc33..eaf0bde9 100644 --- a/resources/i18n/sankore_pt.ts +++ b/resources/i18n/sankore_pt.ts @@ -800,10 +800,6 @@ Import old Sankore or Uniboard documents Importar Antigas Versões de Documentos Uniboard ou Sankoré - - Group Items - Agrupar itens - Group items Agrupar itens @@ -825,6 +821,10 @@ Remove the backgound Remover o fundo + + Group + + PasswordDialog @@ -867,23 +867,12 @@ QObject - /Home - Category list label on navigation tool bar - Lista de Categorias na barra de navegação (Dentro da Biblioteca) - /Casa + Element ID = + - Trash - Pictures category element - Na Categoria de Imagens - Lixo - - - - UBAbstractWidget - - Loading ... - A carregar ... + Content is not supported in destination format. + @@ -946,6 +935,18 @@ All Supported (%1) Tudo Suportado (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1169,12 +1170,20 @@ Ficheiro %1 gravado - Importing page %1 of %2 - A importar página %1 de %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Erro nos dados da imagem. Ficheiro %1 ignorado + Import successful. + Importação bem sucedida. + + + Importing file + + + + Import of file %1 successful. + @@ -1248,6 +1257,13 @@ Cancelar + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1428,6 +1444,53 @@ ImportedImage Imagem Importada + + Audios + Áudios + + + Movies + Vídeos + + + Pictures + Imagens + + + Animations + Animações + + + Interactivities + Atividades Interativas + + + Applications + Aplicações + + + Shapes + Formas + + + Favorites + + + + Web search + + + + Trash + Lixo + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1462,6 +1525,24 @@ Editável + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + A carregar ... + + UBGraphicsWidgetItemDelegate @@ -1521,14 +1602,6 @@ Image Format ( Formato da Imagem ( - - Image import failed. - Falha na importação da Imagem. - - - Image import successful. - Importação da Imagem bem sucedida. - UBImportPDF @@ -1544,10 +1617,6 @@ Importing page %1 of %2 A importar a página %1 de %2 - - PDF import successful. - Importação, do PDF, bem sucedida. - UBIntranetPodcastPublisher @@ -1574,120 +1643,6 @@ Enter - - UBLibActionBar - - Add to favorites - Adicionar aos favoritos - - - Share - Partilhar - - - Search - Procurar - - - Delete - Apagar - - - Back to folder - Voltar à pasta - - - Remove from favorites - Remover dos favoritos - - - Create new folder - Criar uma nova pasta - - - - UBLibItemProperties - - Add to page - Adicionar à página - - - Set as background - Definir como fundo - - - Add to library - Adicionar à biblioteca - - - Object informations - Informações do Objecto - - - - UBLibraryController - - ImportedImage - Imagem Importada - - - Added 1 Image to Library - Adicionada 1 Imagem à Biblioteca - - - Audios - Audio category element - Áudios - - - Movies - Movies category element - Vídeos - - - Pictures - Pictures category element - Imagens - - - Shapes - Shapes category element - Formas - - - Applications - Applications category element - Aplicações - - - Favorite - Favorite category element - Favoritos - - - Interactivities - Interactives category element - Atividades Interativas - - - Animations - Animations category element - Animações - - - Creating image thumbnail for %1. - A criar miniatura para %1. - - - Adding to page failed for item %1. - Falha ao adicionar item %1 à página. - - - Web Search - Web search category element - Procurar na Web - - UBMainWindow @@ -1703,6 +1658,13 @@ Ok + + UBMessagesDialog + + Close + Fechar + + UBNetworkAccessManager @@ -1738,25 +1700,6 @@ Quer ignorar estes erros, deste servidor? Não - - UBNewFolderDlg - - Add new folder - Criar uma nova pasta - - - New Folder name: - Nome da pasta criada: - - - Add - Adicionar - - - Cancel - Cancelar - - UBPersistenceManager @@ -1917,6 +1860,14 @@ Quer ignorar estes erros, deste servidor? My Movies Os meus filmes + + Group + + + + Ungroup + + UBTGActionWidget @@ -2191,13 +2142,6 @@ Por favor, reinicie o aplicativo para aceder aos documentos atualizados.Lembrar-me depois - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index 26a21185..0b9ee671 100644 --- a/resources/i18n/sankore_rm.ts +++ b/resources/i18n/sankore_rm.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,20 +865,11 @@ QObject - Trash - Pictures category element + Element ID = - /Home - Category list label on navigation tool bar - - - - - UBAbstractWidget - - Loading ... + Content is not supported in destination format. @@ -942,6 +933,18 @@ All Supported (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,11 +1167,19 @@ - Importing page %1 of %2 + Inserting page %1 of %2 + + + + Import successful. + + + + Importing file - Erronous image data, skipping file %1 + Import of file %1 successful. @@ -1242,6 +1253,13 @@ + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage + + Audios + + + + Movies + + + + Pictures + + + + Animations + + + + Interactivities + + + + Applications + + + + Shapes + + + + Favorites + + + + Web search + + + + Trash + + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( - - Image import failed. - - - - Image import successful. - - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 - - PDF import successful. - - UBIntranetPodcastPublisher @@ -1568,131 +1639,24 @@ - UBLibActionBar - - Add to favorites - - - - Share - - - - Search - - - - Delete - - - - Back to folder - - - - Remove from favorites - - - - Create new folder - - - - - UBLibItemProperties - - Add to page - - - - Set as background - - - - Add to library - - - - Object informations - - - - - UBLibraryController - - Added 1 Image to Library - - - - Audios - Audio category element - - - - Movies - Movies category element - - - - Pictures - Pictures category element - - - - Shapes - Shapes category element - - - - Applications - Applications category element - - - - Favorite - Favorite category element - - - - Creating image thumbnail for %1. - - - - Adding to page failed for item %1. - - - - Interactivities - Interactives category element - - + UBMainWindow - ImportedImage + Yes - Animations - Animations category element + No - Web Search - Web search category element + Ok - UBMainWindow - - Yes - - + UBMessagesDialog - No - - - - Ok + Close @@ -1725,25 +1689,6 @@ Do you want to ignore these errors for this host? - - UBNewFolderDlg - - Add new folder - - - - New Folder name: - - - - Add - - - - Cancel - - - UBPersistenceManager @@ -1904,6 +1849,14 @@ Do you want to ignore these errors for this host? My Movies + + Group + + + + Ungroup + + UBTGActionWidget @@ -2181,13 +2134,6 @@ Please reboot the application to access the updated documents. - - UBW3CWidget - - Web - - - UBWebPluginWidget diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index dee6fbc6..4ba43afb 100644 --- a/resources/i18n/sankore_ro.ts +++ b/resources/i18n/sankore_ro.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importare documente vechi Sankore sau Uniboard - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Coş de gunoi - - - /Home - Category list label on navigation tool bar - /Acasă + Element ID = + - - - UBAbstractWidget - Loading ... - Încărcare ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Tot ce se suportă (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Fişier %1 salvat - Importing page %1 of %2 - Importare pagina %1 din %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Dată imagine eronată, salt peste fişier %1 + Import successful. + Importare reuşită. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Anulare + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage ImportedImage + + Audios + Înregistrări audio + + + Movies + Filme + + + Pictures + Imagini + + + Animations + Animaţii + + + Interactivities + Interactivităţi + + + Applications + Aplicaţii + + + Shapes + Forme + + + Favorites + + + + Web search + + + + Trash + Coş de gunoi + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Editabil + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Încărcare ... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Format imagine ( - - Image import failed. - Importare imagine nereuşită. - - - Image import successful. - Importare imagine reuşită. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importare pagina %1 din %2 - - PDF import successful. - Importare PDF reuşită. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Intrare - - UBLibActionBar - - Add to favorites - Adăugare la favorite - - - Share - Distribuire - - - Search - Căutare - - - Delete - Ştergere - - - Back to folder - Înapoi la folder - - - Remove from favorites - Eliminare din favorite - - - Create new folder - Creare folder nou - - - - UBLibItemProperties - - Add to page - Adăugare la pagină - - - Set as background - Setare ca fundal - - - Add to library - Adăugare la bibliotecă - - - Object informations - Informaţii despre obiect - - - - UBLibraryController - - Added 1 Image to Library - S-a adăugat 1 imagine la bibliotecă - - - Audios - Audio category element - Înregistrări audio - - - Movies - Movies category element - Filme - - - Pictures - Pictures category element - Imagini - - - Shapes - Shapes category element - Forme - - - Applications - Applications category element - Aplicaţii - - - Favorite - Favorite category element - Favorit - - - Creating image thumbnail for %1. - Creare miniatură imagine pentru %1. - - - Adding to page failed for item %1. - Adăugare la pagină nereuşită pentru articol %1. - - - Interactivities - Interactives category element - Interactivităţi - - - ImportedImage - ImportedImage - - - Animations - Animations category element - Animaţii - - - Web Search - Web search category element - Căutare web - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Închidere + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Doriţi să ignoraţi aceste erori pentru acest host? Nu - - UBNewFolderDlg - - Add new folder - Adăugare fişier nou - - - New Folder name: - Nume fişier nou: - - - Add - Adăugare - - - Cancel - Anulare - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Doriţi să ignoraţi aceste erori pentru acest host? My Movies Filmele mele + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Vă rugăm să reporniţi aplicaţia pentru a accesa documentele actualizate.Reaminteşte-mi mai târziu - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index 368bd3ef..daa1d05d 100644 --- a/resources/i18n/sankore_ru.ts +++ b/resources/i18n/sankore_ru.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Импортировать старые Sankore и Uniboard документы - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Корзина - - - /Home - Category list label on navigation tool bar - /Главная + Element ID = + - - - UBAbstractWidget - Loading ... - Загрузка... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Все поддерживаемые типы (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Файл %1 сохранен - Importing page %1 of %2 - Импорт страницы %1 из %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Неверные данные изображения, пропустить файл %1 + Import successful. + Импорт успешно завершен. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Отмена + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Импортированные изображения + + Audios + Аудио + + + Movies + Видео + + + Pictures + Картинки + + + Animations + Мультфильмы + + + Interactivities + Интерактивные элементы + + + Applications + Приложения + + + Shapes + Формы + + + Favorites + + + + Web search + + + + Trash + Корзина + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Редактируемый + + UBGraphicsW3CWidgetItem + + Web + + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Загрузка... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Формат изображения ( - - Image import failed. - Ошибка импорта изображения. - - - Image import successful. - Импорт изображения успешно завершен. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Импорт страницы %1 из %2 - - PDF import successful. - Импорт PDF успешно завершен. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Ввод - - UBLibActionBar - - Add to favorites - Добавить в избранное - - - Share - Совместный доступ - - - Search - Поиск - - - Delete - Удалить - - - Back to folder - Назад в папку - - - Remove from favorites - Удалить из избранного - - - Create new folder - Создать новую папку - - - - UBLibItemProperties - - Add to page - Добавить на страницу - - - Set as background - Сделать фоновым изображением - - - Add to library - Добавить в библиотеку - - - Object informations - Информация об объекте - - - - UBLibraryController - - Added 1 Image to Library - В библиотеку добавлено 1 изображение - - - Audios - Audio category element - Аудио - - - Movies - Movies category element - Видео - - - Pictures - Pictures category element - Картинки - - - Shapes - Shapes category element - Формы - - - Applications - Applications category element - Приложения - - - Favorite - Favorite category element - Избранное - - - Creating image thumbnail for %1. - Создать эскиз страницы для %1. - - - Adding to page failed for item %1. - Ошибка добавления на страницу для элемента %1. - - - Interactivities - Interactives category element - Интерактивные элементы - - - ImportedImage - Импортированные изображения - - - Animations - Animations category element - Мультфильмы - - - Web Search - Web search category element - Веб поиск - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Закрыть + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Do you want to ignore these errors for this host? Нет - - UBNewFolderDlg - - Add new folder - Добавить новую папку - - - New Folder name: - Имя новой папки: - - - Add - Добавить - - - Cancel - Отмена - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Do you want to ignore these errors for this host? My Movies Мои видеофайлы + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Please reboot the application to access the updated documents. Напомнить позже - - UBW3CWidget - - Web - Веб - - UBWebPluginWidget diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/sankore_sk.ts index 33edd3c1..3fd066ba 100644 --- a/resources/i18n/sankore_sk.ts +++ b/resources/i18n/sankore_sk.ts @@ -801,10 +801,6 @@ Erase Annotation Vymazať anotáciu - - Group Items - Zoskupiť položky - Group items Zoskupiť položky @@ -825,6 +821,10 @@ Remove the backgound Odstrániť pozadie + + Group + + PasswordDialog @@ -867,22 +867,12 @@ QObject - /Home - Category list label on navigation tool bar - /Domov - /Home + Element ID = + - Trash - Pictures category element - Kôš - - - - UBAbstractWidget - - Loading ... - Nahráva sa... + Content is not supported in destination format. + @@ -945,6 +935,18 @@ Download finished Sťahovanie bolo dokončené + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1152,10 +1154,6 @@ objects objekty - - Erronous image data, skipping file %1 - Chybné údaje o obrázku, preskakuje sa súbor %1 - images obrázky @@ -1173,8 +1171,20 @@ Súbor %1 bol uložený - Importing page %1 of %2 - Nahráva sa stránka %1 z(o) %2 + Inserting page %1 of %2 + + + + Import successful. + Nahrávanie bolo úspešne dokončené. + + + Importing file + + + + Import of file %1 successful. + @@ -1249,6 +1259,13 @@ Zrušiť + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1428,6 +1445,53 @@ ImportedImage NahranýObrázok + + Audios + Zvuky + + + Movies + Filmy + + + Pictures + Obrázky + + + Animations + Animácie + + + Interactivities + Interaktívne objekty + + + Applications + Aplikácie + + + Shapes + Geometrické útvary + + + Favorites + + + + Web search + + + + Trash + Kôš + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1462,6 +1526,24 @@ Dá sa upraviť + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Nahráva sa... + + UBGraphicsWidgetItemDelegate @@ -1521,14 +1603,6 @@ Image Format ( Súbor obrázka ( - - Image import failed. - Nepodarilo sa nahrať obrázok. - - - Image import successful. - Obrázok bol úspešne nahraný. - UBImportPDF @@ -1536,10 +1610,6 @@ PDF import failed. Nahrávanie do PDF zlyhalo. - - PDF import successful. - Nahrávanie do PDF bolo úspešne dokončené. - Importing page %1 of %2 Nahráva sa stránka %1 z(o) %2 @@ -1574,120 +1644,6 @@ Enter - - UBLibActionBar - - Share - Podeliť sa - - - Back to folder - Späť na priečinok - - - Remove from favorites - Odstrániť z obľúbených položiek - - - Delete - Vymazať - - - Search - Hľadať - - - Add to favorites - Pridať do obľúbených položiek - - - Create new folder - Vytvoriť nový priečinok - - - - UBLibItemProperties - - Object informations - Informácie o objekte - - - Add to library - Pridať do knižnice - - - Set as background - Nastaviť ako pozadie - - - Add to page - Pridať na stránku - - - - UBLibraryController - - Creating image thumbnail for %1. - Vytvára sa miniatúra obrázka z(o) %1. - - - Adding to page failed for item %1. - Na stránku sa nepodarilo pridať položku %1. - - - Added 1 Image to Library - Do knižnice bol pridaný 1 obrázok - - - ImportedImage - NahranýObrázok - - - Audios - Audio category element - Zvuky - - - Movies - Movies category element - Filmy - - - Pictures - Pictures category element - Obrázky - - - Shapes - Shapes category element - Geometrické útvary - - - Applications - Applications category element - Aplikácie - - - Favorite - Favorite category element - Obľúbené položky - - - Interactivities - Interactives category element - Interaktívne objekty - - - Web Search - Web search category element - Internetové vyhľadávanie - - - Animations - Animations category element - Animácie - - UBMainWindow @@ -1703,6 +1659,13 @@ Áno + + UBMessagesDialog + + Close + Zatvoriť + + UBNetworkAccessManager @@ -1738,25 +1701,6 @@ Do you want to ignore these errors for this host? Chcete ignorovať tieto chyby na tomto serveri? - - UBNewFolderDlg - - Add - Pridať - - - New Folder name: - Názov nového priečinka: - - - Cancel - Zrušiť - - - Add new folder - Pridať nový priečinok - - UBPersistenceManager @@ -1917,6 +1861,14 @@ Chcete ignorovať tieto chyby na tomto serveri? Untitled Documents Dokumenty bez názvu + + Group + + + + Ungroup + + UBTGActionWidget @@ -2195,13 +2147,6 @@ Znova spustite aplikáciu, aby ste mohli pracovať s aktualizovanými dokumentmi Pripomenúť mi neskôr - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index 4e7b88eb..7b2a4812 100644 --- a/resources/i18n/sankore_sv.ts +++ b/resources/i18n/sankore_sv.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Importera gamla Sankoré eller Unibord dokument - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Papperskorg - - - /Home - Category list label on navigation tool bar - Hem + Element ID = + - - - UBAbstractWidget - Loading ... - Laddar ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Alla stöds (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1165,12 +1168,20 @@ Fil %1 sparad - Importing page %1 of %2 - Importerar sida %1 av %2 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Fel på bild data, hoppar över fil %1 + Import successful. + Import lyckades. + + + Importing file + + + + Import of file %1 successful. + @@ -1244,6 +1255,13 @@ Avsluta + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1423,6 +1441,53 @@ ImportedImage Importeradbild + + Audios + Ljudspår + + + Movies + Filmer + + + Pictures + Foton + + + Animations + Animationer + + + Interactivities + Interaktiviteter + + + Applications + Applikationer + + + Shapes + Former + + + Favorites + + + + Web search + + + + Trash + Papperskorg + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1457,6 +1522,24 @@ Redigerbar + + UBGraphicsW3CWidgetItem + + Web + Nät + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Laddar ... + + UBGraphicsWidgetItemDelegate @@ -1516,14 +1599,6 @@ Image Format ( Bild format ( - - Image import failed. - Import av bild misslyckades. - - - Image import successful. - Import av bild lyckades. - UBImportPDF @@ -1539,10 +1614,6 @@ Importing page %1 of %2 Importerar sida %1 av %2 - - PDF import successful. - PDF import lyckad. - UBIntranetPodcastPublisher @@ -1569,120 +1640,6 @@ Enter - - UBLibActionBar - - Add to favorites - Lägg till favoriter - - - Share - Dela - - - Search - Sök - - - Delete - Radera - - - Back to folder - Tillbaka till mapp - - - Remove from favorites - Ta bort från favoriter - - - Create new folder - Skapa ny mapp - - - - UBLibItemProperties - - Add to page - Lägg till sida - - - Set as background - Infoga som bakgrund - - - Add to library - Lägg till bibliotek - - - Object informations - Objekt information - - - - UBLibraryController - - Added 1 Image to Library - 1 bild lades till bildbiblioteket - - - Audios - Audio category element - Ljudspår - - - Movies - Movies category element - Filmer - - - Pictures - Pictures category element - Foton - - - Shapes - Shapes category element - Former - - - Applications - Applications category element - Applikationer - - - Favorite - Favorite category element - Favorit - - - Creating image thumbnail for %1. - Skapar miniatyrbild för%1. - - - Adding to page failed for item %1. - Lägga till sida för objekt %1. - - - Interactivities - Interactives category element - Interaktiviteter - - - ImportedImage - Importeradbild - - - Animations - Animations category element - Animationer - - - Web Search - Web search category element - Objekt i websökkategorin - - UBMainWindow @@ -1698,6 +1655,13 @@ Ok + + UBMessagesDialog + + Close + Stäng + + UBNetworkAccessManager @@ -1733,25 +1697,6 @@ Vill du ignorera felen för den här värden? Nej - - UBNewFolderDlg - - Add new folder - Lägg till ny mapp - - - New Folder name: - Nytt foldernamn: - - - Add - Lägg till - - - Cancel - Avsluta - - UBPersistenceManager @@ -1912,6 +1857,14 @@ Vill du ignorera felen för den här värden? My Movies Mina filmer + + Group + + + + Ungroup + + UBTGActionWidget @@ -2190,13 +2143,6 @@ Vänligen starta om programmet för att komma åt uppdaterade dokument.Påminn mig senare - - UBW3CWidget - - Web - Nät - - UBWebPluginWidget diff --git a/resources/i18n/sankore_tr.ts b/resources/i18n/sankore_tr.ts index 2c3b3f95..141e96e5 100755 --- a/resources/i18n/sankore_tr.ts +++ b/resources/i18n/sankore_tr.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents Eski Sankore yada Uniboard Dökümanı İçeri Aktar - - Group Items - Parçaları Grupla - Group items Grup Parçaları @@ -823,6 +819,10 @@ Remove the backgound Arkaplanı Kaldır + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - Çöpe At - - - /Home - Category list label on navigation tool bar - Ana Sayfa + Element ID = + - - - UBAbstractWidget - Loading ... - Yükleniyor ... + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) Tümü Desteklenir (%1) + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,12 +1167,20 @@ %1 adlı dosya kaydedildi - Importing page %1 of %2 - %2 Sayfadan %1 İçeri aktarıldı + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - Hatalı resim verisi. %1 adlı dosya geçildi + Import successful. + İçe aktarım tamamlandı. + + + Importing file + + + + Import of file %1 successful. + @@ -1243,6 +1254,13 @@ İptal + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1422,6 +1440,53 @@ ImportedImage İçerAktarılanResim + + Audios + Sesler + + + Movies + Videolar + + + Pictures + Resimler + + + Animations + Animasyonlar + + + Interactivities + İnteraktiviteler + + + Applications + Uygulamalar + + + Shapes + Şekiller + + + Favorites + + + + Web search + + + + Trash + + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1456,6 +1521,24 @@ Düzenlenebilir + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + Yükleniyor ... + + UBGraphicsWidgetItemDelegate @@ -1515,14 +1598,6 @@ Image Format ( Resim Biçimi ( - - Image import failed. - Resim aktarımı başarısız oldu. - - - Image import successful. - Resim aktarımı tamamlandı. - UBImportPDF @@ -1538,10 +1613,6 @@ Importing page %1 of %2 İçe aktarılan sayfa: %1 / %2 - - PDF import successful. - PDF dosyasının içe aktarımı tamamlandı. - UBIntranetPodcastPublisher @@ -1568,120 +1639,6 @@ Giriş - - UBLibActionBar - - Add to favorites - Sık kullanılanlara ekle - - - Share - Paylaş - - - Search - Ara - - - Delete - Sil - - - Back to folder - Klasöre geri dön - - - Remove from favorites - Sık kullanılanlardan kaldır - - - Create new folder - Yeni klasör oluştur - - - - UBLibItemProperties - - Add to page - Sayfaya ekle - - - Set as background - Arkaplan olarak belirle - - - Add to library - Kütüphaneye ekle - - - Object informations - Nesne bilgisi - - - - UBLibraryController - - Added 1 Image to Library - 1 Resim Kütüphaneye Eklendi - - - Audios - Audio category element - Sesler - - - Movies - Movies category element - Videolar - - - Pictures - Pictures category element - Resimler - - - Shapes - Shapes category element - Şekiller - - - Applications - Applications category element - Uygulamalar - - - Favorite - Favorite category element - Sık Kullanılanlar - - - Creating image thumbnail for %1. - %1 İçin ufak resim oluşturuluyor. - - - Adding to page failed for item %1. - %1 nesnesinin sayfaya eklenmesi başarısız oldu. - - - Interactivities - Interactives category element - İnteraktiviteler - - - ImportedImage - İçeAktarılanResim - - - Animations - Animations category element - Animasyonlar - - - Web Search - Web search category element - Web'de Ara - - UBMainWindow @@ -1697,6 +1654,13 @@ Tamam + + UBMessagesDialog + + Close + Kapat + + UBNetworkAccessManager @@ -1731,25 +1695,6 @@ Bu host için yukarıdaki hatalar yok sayılsın mı? Hayır - - UBNewFolderDlg - - Add new folder - Yeni klasör ekle - - - New Folder name: - Yeni Klasör Adı: - - - Add - Ekle - - - Cancel - İptal - - UBPersistenceManager @@ -1910,6 +1855,14 @@ Bu host için yukarıdaki hatalar yok sayılsın mı? My Movies Filimlerim + + Group + + + + Ungroup + + UBTGActionWidget @@ -2188,13 +2141,6 @@ Güncellenen dökümanlara erişmek için uygulamayı yeniden başlatın.Sonra hatırlat - - UBW3CWidget - - Web - Web - - UBWebPluginWidget diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index e4f4410c..224253a8 100644 --- a/resources/i18n/sankore_zh.ts +++ b/resources/i18n/sankore_zh.ts @@ -799,10 +799,6 @@ Import old Sankore or Uniboard documents 导入以前的Sankore或Uniboard文件 - - Group Items - - Group items @@ -823,6 +819,10 @@ Remove the backgound + + Group + + PasswordDialog @@ -865,21 +865,12 @@ QObject - Trash - Pictures category element - 回收站 - - - /Home - Category list label on navigation tool bar - /主页 + Element ID = + - - - UBAbstractWidget - Loading ... - 载入中…… + Content is not supported in destination format. + @@ -942,6 +933,18 @@ All Supported (%1) 所有支持的（%1） + + Delete page %1 from document + + + + Page %1 deleted + + + + Add file operation failed: file copying error + + UBBoardPaletteManager @@ -1164,12 +1167,20 @@ 文件%1已保存 - Importing page %1 of %2 - 导入%2的页面%1 + Inserting page %1 of %2 + - Erronous image data, skipping file %1 - 图片数据错误，跳过文件%1 + Import successful. + 导入成功 + + + Importing file + + + + Import of file %1 successful. + @@ -1242,6 +1253,13 @@ 取消 + + UBExportAdaptor + + Warnings during export was appeared + + + UBExportCFF @@ -1421,6 +1439,53 @@ ImportedImage 已导入图片 + + Audios + 音频 + + + Movies + 视频 + + + Pictures + 图片 + + + Animations + 动画 + + + Interactivities + 互动 + + + Applications + 应用程序 + + + Shapes + 形状 + + + Favorites + + + + Web search + + + + Trash + 回收站 + + + + UBFeaturesProgressInfo + + load + + UBGraphicsItemDelegate @@ -1455,6 +1520,24 @@ 可编辑 + + UBGraphicsW3CWidgetItem + + Web + 网页 + + + + UBGraphicsWidgetItem + + Cannot load content + + + + Loading ... + 载入中…… + + UBGraphicsWidgetItemDelegate @@ -1514,14 +1597,6 @@ Image Format ( 图片格式 - - Image import failed. - 图片导入失败. - - - Image import successful. - 图片导入成功 - UBImportPDF @@ -1537,10 +1612,6 @@ Importing page %1 of %2 正在导入%2的页面%1 - - PDF import successful. - PDF导入成功 - UBIntranetPodcastPublisher @@ -1567,120 +1638,6 @@ 输入 - - UBLibActionBar - - Add to favorites - 添加至收藏夹 - - - Share - 分享 - - - Search - 搜索 - - - Delete - 删除 - - - Back to folder - 返回上级文件夹 - - - Remove from favorites - 从收藏夹中移除 - - - Create new folder - 新建文件夹 - - - - UBLibItemProperties - - Add to page - 添加至页面 - - - Set as background - 设置为背景 - - - Add to library - 添加至图书馆 - - - Object informations - 素材信息 - - - - UBLibraryController - - Added 1 Image to Library - 添加一个图片至图书馆 - - - Audios - Audio category element - 音频 - - - Movies - Movies category element - 视频 - - - Pictures - Pictures category element - 图片 - - - Shapes - Shapes category element - 形状 - - - Applications - Applications category element - 应用程序 - - - Favorite - Favorite category element - 收藏 - - - Creating image thumbnail for %1. - 为图像%1创建缩略图 - - - Adding to page failed for item %1. - 添加项目%1至页面失败 - - - Interactivities - Interactives category element - 互动 - - - ImportedImage - 已导入图片 - - - Animations - Animations category element - 动画 - - - Web Search - Web search category element - 网页搜索 - - UBMainWindow @@ -1696,6 +1653,13 @@ 确定 + + UBMessagesDialog + + Close + 关闭 + + UBNetworkAccessManager @@ -1731,25 +1695,6 @@ Do you want to ignore these errors for this host? 否 - - UBNewFolderDlg - - Add new folder - 添加新文件夹 - - - New Folder name: - 新文件夹名 - - - Add - 添加 - - - Cancel - 取消 - - UBPersistenceManager @@ -1910,6 +1855,14 @@ Do you want to ignore these errors for this host? My Movies 我的视频 + + Group + + + + Ungroup + + UBTGActionWidget @@ -2188,13 +2141,6 @@ Please reboot the application to access the updated documents. 稍后再提醒我 - - UBW3CWidget - - Web - 网页 - - UBWebPluginWidget From 1cbd5850c89b9a08798f4fe2a7270cf2d088fd20 Mon Sep 17 00:00:00 2001 From: Ilia Ryabokon Date: Fri, 24 Aug 2012 15:24:17 +0300 Subject: [PATCH 11/16] Sankore 1034 Flash is now available for duplicating --- src/board/UBBoardController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index ddf0cdb8..bcfc1ddd 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1237,7 +1237,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri { UBGraphicsWidgetItem *widgetItem = mActiveScene->addW3CWidget(QUrl::fromLocalFile(widgetUrl), pPos); widgetItem->setUuid(QUuid::createUuid()); - widgetItem->setSourceUrl(sourceUrl); + widgetItem->setSourceUrl(QUrl::fromLocalFile(widgetUrl)); UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); From 907f30570345015328a125348d726488edcd0027 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 24 Aug 2012 15:30:52 +0300 Subject: [PATCH 12/16] Play and Selector tools behavior restored after changing of architecture of QGraphicsWidgets. Fixed some related issues. --- src/board/UBBoardView.cpp | 147 +++++++++++++++------- src/board/UBBoardView.h | 2 + src/core/UB.h | 8 +- src/domain/UBGraphicsItemDelegate.cpp | 19 +-- src/domain/UBGraphicsItemDelegate.h | 3 + src/domain/UBGraphicsScene.cpp | 10 +- src/domain/UBGraphicsTextItem.cpp | 20 ++- src/domain/UBGraphicsTextItemDelegate.cpp | 2 +- src/domain/UBGraphicsWidgetItem.cpp | 10 -- src/domain/UBGraphicsWidgetItem.h | 17 +-- 10 files changed, 140 insertions(+), 98 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 4fcca179..dc782e66 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -415,11 +415,7 @@ bool UBBoardView::itemIsLocked(QGraphicsItem *item) if (!item) return false; - if (item->data(UBGraphicsItemData::ItemLocked).toBool()) - return true; - - return itemIsLocked(item->parentItem()); - + return item->data(UBGraphicsItemData::ItemLocked).toBool(); } bool UBBoardView::itemHaveParentWithType(QGraphicsItem *item, int type) @@ -434,32 +430,76 @@ bool UBBoardView::itemHaveParentWithType(QGraphicsItem *item, int type) } +void UBBoardView::handleItemsSelection(QGraphicsItem *item) +{ +// we need to select new pressed itemOnBoard and deselect all other items. +// the trouble is in: +// some items can has parents (groupped items or strokes, or strokes in groups). +// some items is already selected and we don't need to reselect them +// +// item selection managed by QGraphicsView::mousePressEvent(). It should be called later. + + if (item) + { + // item has group as first parent - it is any item or UBGraphicsStrokesGroup. + if(item->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type()) + return; + + // delegate buttons shouldn't selected + if (DelegateButton::Type == movingItem->type()) + return; + + // click on svg items (images on Frame) shouldn't change selection. + if (QGraphicsSvgItem::Type == movingItem->type()) + return; + + // Delegate frame shouldn't selected + if (UBGraphicsDelegateFrame::Type == movingItem->type()) + return; + + + // if we need to uwe multiple selection - we shouldn't deselect other items. + if (!mMultipleSelectionIsEnabled) + { + // if Item can be selected at mouse press - then we need to deselect all other items. + foreach(QGraphicsItem *iter_item, scene()->selectedItems()) + { + if (iter_item != item) + { + iter_item->setSelected(false); + } + } + } + } +} + bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item) { - if (!item) +/* +Some items should receive mouse press events averytime, +some items should receive that events when they are selected, +some items shouldn't receive mouse press events at mouse press, but should receive them at mouse release (suspended mouse press event) + +Here we determines cases when items should to get mouse press event at pressing on mouse. +*/ + + if (!item) return true; + // for now background objects is not interactable, but it can be deprecated for some items in the future. if (item == scene()->backgroundObject()) return false; - if (itemIsLocked(item)) - return false; - - + // some behavior depends on current tool. UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); - if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type()) - { - movingItem = NULL; - return false; - } - switch(item->type()) { - + case DelegateButton::Type: case UBGraphicsMediaItem::Type: return false; + case UBGraphicsSvgItem::Type: case UBGraphicsPixmapItem::Type: case UBGraphicsTextItem::Type: if ((currentTool == UBStylusTool::Selector) && item->isSelected()) @@ -470,10 +510,18 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item) return false; break; + // Groups shouldn't reacts on any presses and moves for Play tool. case UBGraphicsGroupContainerItem::Type: - return (currentTool == UBStylusTool::Selector); + if(currentTool == UBStylusTool::Play) + { + movingItem = NULL; + return false; + } + else + return true; + break; - case UBGraphicsW3CWidgetItem::Type: + case UBGraphicsWidgetItem::Type: if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected()) return true; if (currentTool == UBStylusTool::Selector && item->isSelected()) @@ -497,28 +545,27 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item) if (item == scene()->backgroundObject()) return false; - if (itemIsLocked(item)) - return false; - UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); switch(item->type()) { case UBGraphicsPixmapItem::Type: case UBGraphicsTextItem::Type: - case UBGraphicsW3CWidgetItem::Type: + case UBGraphicsWidgetItem::Type: if (currentTool == UBStylusTool::Selector && !item->isSelected() && item->parentItem()) return true; if (currentTool == UBStylusTool::Selector && item->isSelected()) return true; break; + case DelegateButton::Type: case UBGraphicsMediaItem::Type: return true; default: return false; } + return false; } @@ -552,6 +599,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) if(currentTool == UBStylusTool::Play) return false; + case UBGraphicsSvgItem::Type: case UBGraphicsPixmapItem::Type: if (item->isSelected()) return false; @@ -565,6 +613,29 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) return false; } + +QGraphicsItem* UBBoardView::determineItemToPress(QGraphicsItem *item) +{ + if(item) + { + UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); + + // groups should should be moved instead of strokes groups + if (item->parentItem() && UBGraphicsStrokesGroup::Type == item->type()) + return item->parentItem(); + + // if item is on group and froup is not selected - group should take press. + if (UBStylusTool::Selector == currentTool && item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type() && !item->parentItem()->isSelected()) + return item->parentItem(); + + // items like polygons placed in two groups nested, so we need to recursive call. + if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type()) + return determineItemToPress(item->parentItem()); + } + + return item; +} + // determine item to interacts: item self or it's container. QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item) { @@ -599,7 +670,7 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item) // items like polygons placed in two groups nested, so we need to recursive call. if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type()) - return determineItemToMove(item->parentItem()); + return determineItemToMove(item->parentItem()); } return item; @@ -612,28 +683,17 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event) // Determining item who will take mouse press event //all other items will be deselected and if all item will be deselected, then // wrong item can catch mouse press. because selected items placed on the top - QGraphicsItem *pressedItem = determineItemToMove(movingItem); + QGraphicsItem *pressedItem = determineItemToPress(movingItem); - if (movingItem - && !(movingItem->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type()) - && QGraphicsSvgItem::Type != movingItem->type() - && UBGraphicsDelegateFrame::Type != movingItem->type() - && !mMultipleSelectionIsEnabled) - { - foreach(QGraphicsItem *item, scene()->selectedItems()) - { - if (item != pressedItem) - { - item->setSelected(false); - } - } - } + handleItemsSelection(movingItem); if (mMultipleSelectionIsEnabled) return; if (itemShouldReceiveMousePressEvent(movingItem)) + { QGraphicsView::mousePressEvent (event); + } else { if (movingItem) @@ -991,7 +1051,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); setToolCursor (currentTool); - // first propagate device release to the scene + // first/ propagate device release to the scene if (scene ()) scene ()->inputDeviceRelease (); @@ -1012,13 +1072,14 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) movingItem = NULL; delete suspendedMousePressEvent; suspendedMousePressEvent = NULL; + bReleaseIsNeed = true; } else { if (QGraphicsSvgItem::Type != movingItem->type() && UBGraphicsDelegateFrame::Type != movingItem->type() && - UBToolWidget::Type != movingItem->type() && - QGraphicsWidget::Type != movingItem->type() && + UBToolWidget::Type != movingItem->type() && + QGraphicsWebView::Type != movingItem->type() && // for W3C widgets as Tools. !(movingItem->parentItem() && UBGraphicsW3CWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())) { bReleaseIsNeed = false; @@ -1054,7 +1115,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) } else { - if (suspendedMousePressEvent && movingItem && !movingItem->data(UBGraphicsItemData::ItemLocked).toBool()) + if (suspendedMousePressEvent) { QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop movingItem = NULL; diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h index 310ec2ec..f2aa69ee 100644 --- a/src/board/UBBoardView.h +++ b/src/board/UBBoardView.h @@ -54,10 +54,12 @@ class UBBoardView : public QGraphicsView protected: bool itemIsLocked(QGraphicsItem *item); + void handleItemsSelection(QGraphicsItem *item); bool itemShouldReceiveMousePressEvent(QGraphicsItem *item); bool itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item); bool itemHaveParentWithType(QGraphicsItem *item, int type); bool itemShouldBeMoved(QGraphicsItem *item); + QGraphicsItem* determineItemToPress(QGraphicsItem *item); QGraphicsItem* determineItemToMove(QGraphicsItem *item); void handleItemMousePress(QMouseEvent *event); void handleItemMouseMove(QMouseEvent *event); diff --git a/src/core/UB.h b/src/core/UB.h index 02e2ba18..bc3bd890 100644 --- a/src/core/UB.h +++ b/src/core/UB.h @@ -133,11 +133,10 @@ struct UBGraphicsItemType PolygonItemType = QGraphicsItem::UserType + 1, PixmapItemType, SvgItemType, + DelegateButtonType, MediaItemType, - AppleWidgetItemType, PDFItemType, - TextItemType, - W3CWidgetItemType, + TextItemType, CurtainItemType, RulerItemType, CompassItemType, @@ -147,7 +146,8 @@ struct UBGraphicsItemType MagnifierItemType, cacheItemType, groupContainerType, - ToolWidgetItemType + ToolWidgetItemType, + GraphicsWidgetItemType }; }; diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index e0cfcc33..4abeb1a2 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -75,7 +75,6 @@ void DelegateButton::mousePressEvent(QGraphicsSceneMouseEvent *event) { // make sure delegate is selected, to avoid control being hidden mPressedTime = QTime::currentTime(); -// mDelegated->setSelected(true); event->setAccepted(!mIsTransparentToMouseEvent); } @@ -256,12 +255,7 @@ bool UBGraphicsItemDelegate::mouseMoveEvent(QGraphicsSceneMouseEvent *event) mDragPixmap = QPixmap(); return true; } - if(isLocked()) { - event->accept(); - return true; - } else { - return false; - } + return false; } bool UBGraphicsItemDelegate::weelEvent(QGraphicsSceneWheelEvent *event) @@ -748,16 +742,7 @@ void UBGraphicsToolBarItem::paint(QPainter *painter, const QStyleOptionGraphicsI QPainterPath path; path.addRoundedRect(rect(), 10, 10); - if (parentItem() && parentItem()->data(UBGraphicsItemData::ItemLocked).toBool()) - { - QColor baseColor = UBSettings::paletteColor; - baseColor.setAlphaF(baseColor.alphaF() / 3); - setBrush(QBrush(baseColor)); - } - else - { - setBrush(QBrush(UBSettings::paletteColor)); - } + setBrush(QBrush(UBSettings::paletteColor)); painter->fillPath(path, brush()); } diff --git a/src/domain/UBGraphicsItemDelegate.h b/src/domain/UBGraphicsItemDelegate.h index 099dd06d..c782c94b 100644 --- a/src/domain/UBGraphicsItemDelegate.h +++ b/src/domain/UBGraphicsItemDelegate.h @@ -40,6 +40,9 @@ class DelegateButton: public QGraphicsSvgItem virtual ~DelegateButton(); + enum { Type = UBGraphicsItemType::DelegateButtonType }; + virtual int type() const { return Type; } + void setTransparentToMouseEvent(bool tr) { mIsTransparentToMouseEvent = tr; diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 540ce297..9e88e124 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -2334,7 +2334,7 @@ void UBGraphicsScene::keyReleaseEvent(QKeyEvent * keyEvent) { switch (item->type()) { - case UBGraphicsW3CWidgetItem::Type: + case UBGraphicsWidgetItem::Type: { UBGraphicsW3CWidgetItem *wc3_widget = dynamic_cast(item); if (0 != wc3_widget) @@ -2342,14 +2342,6 @@ void UBGraphicsScene::keyReleaseEvent(QKeyEvent * keyEvent) wc3_widget->remove(); break; } - case UBGraphicsAppleWidgetItem::Type: - { - UBGraphicsAppleWidgetItem *Apple_widget = dynamic_cast(item); - if (0 !=Apple_widget) - if (!Apple_widget->hasFocus()) - Apple_widget->remove(); - break; - } case UBGraphicsTextItem::Type: { UBGraphicsTextItem *text_item = dynamic_cast(item); diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index 393a3640..20adf243 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -23,6 +23,7 @@ #include "core/UBApplication.h" #include "board/UBBoardController.h" #include "board/UBBoardView.h" +#include "board/UBDrawingController.h" #include "core/UBSettings.h" #include "core/memcheck.h" @@ -85,7 +86,15 @@ QVariant UBGraphicsTextItem::itemChange(GraphicsItemChange change, const QVarian void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { - + // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. + // It is a cludge... + if (UBStylusTool::Play == UBDrawingController::drawingController()->stylusTool()) + { + event->accept(); + clearFocus(); + return; + } + if (mDelegate) { mDelegate->mousePressEvent(event); @@ -164,6 +173,15 @@ void UBGraphicsTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { + // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. + // It is a cludge... + if (UBStylusTool::Play == UBDrawingController::drawingController()->stylusTool()) + { + event->accept(); + clearFocus(); + return; + } + if (mMultiClickState == 1) { if (mDelegate) diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp index b24e81d4..6e7e730e 100644 --- a/src/domain/UBGraphicsTextItemDelegate.cpp +++ b/src/domain/UBGraphicsTextItemDelegate.cpp @@ -303,7 +303,7 @@ void UBGraphicsTextItemDelegate::positionHandles() UBGraphicsGroupContainerItem *group = qgraphicsitem_cast(mDelegated->parentItem()); mToolBarItem->hide(); - if (mToolBarItem->parentItem() && !mToolBarItem->parentItem()->data(UBGraphicsItemData::ItemLocked).toBool()) + if (mToolBarItem->parentItem()) { if (group && group->getCurrentItem() == mDelegated && group->isSelected()) mToolBarItem->show(); diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index f85074f8..35bb32ad 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -670,11 +670,6 @@ UBGraphicsAppleWidgetItem::~UBGraphicsAppleWidgetItem() /* NOOP */ } -int UBGraphicsAppleWidgetItem::type() const -{ - return Type; -} - void UBGraphicsAppleWidgetItem::setUuid(const QUuid &pUuid) { UBItem::setUuid(pUuid); @@ -871,11 +866,6 @@ UBGraphicsW3CWidgetItem::~UBGraphicsW3CWidgetItem() /* NOOP */ } -int UBGraphicsW3CWidgetItem::type() const -{ - return Type; -} - void UBGraphicsW3CWidgetItem::setUuid(const QUuid &pUuid) { UBItem::setUuid(pUuid); diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index 18fbe1cc..c7074e2a 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -46,6 +46,10 @@ class UBGraphicsWidgetItem : public UBGraphicsWebView UBGraphicsWidgetItem(const QUrl &pWidgetUrl = QUrl(), QGraphicsItem *parent = 0); ~UBGraphicsWidgetItem(); + enum { Type = UBGraphicsItemType::GraphicsWidgetItemType }; + + virtual int type() const { return Type; } + virtual void initialize(); QUrl mainHtml(); @@ -179,15 +183,8 @@ class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem ~UBGraphicsAppleWidgetItem(); virtual void copyItemParameters(UBItem *copy) const; - virtual int type() const; virtual void setUuid(const QUuid &pUuid); virtual UBItem* deepCopy() const; - - enum - { - Type = UBGraphicsItemType::AppleWidgetItemType - }; - }; class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem @@ -227,15 +224,9 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem QString version; }; - enum - { - Type = UBGraphicsItemType::W3CWidgetItemType - }; - UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0); ~UBGraphicsW3CWidgetItem(); - virtual int type() const; virtual void setUuid(const QUuid &pUuid); virtual UBItem* deepCopy() const; virtual void copyItemParameters(UBItem *copy) const; From 0fc1a4df929201a966bc3a18dffd2bf879ad17e8 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 24 Aug 2012 18:29:23 +0300 Subject: [PATCH 13/16] Eraser: functionality improvement --- src/domain/UBGraphicsPolygonItem.cpp | 22 ++------- src/domain/UBGraphicsPolygonItem.h | 2 - src/domain/UBGraphicsScene.cpp | 73 +++++++++++++++++++++++++--- 3 files changed, 69 insertions(+), 28 deletions(-) diff --git a/src/domain/UBGraphicsPolygonItem.cpp b/src/domain/UBGraphicsPolygonItem.cpp index f00bf42b..b21f2760 100644 --- a/src/domain/UBGraphicsPolygonItem.cpp +++ b/src/domain/UBGraphicsPolygonItem.cpp @@ -143,7 +143,10 @@ QColor UBGraphicsPolygonItem::color() const UBItem* UBGraphicsPolygonItem::deepCopy() const { - UBGraphicsPolygonItem* copy = deepCopy(this->polygon()); + UBGraphicsPolygonItem* copy = new UBGraphicsPolygonItem(polygon(), parentItem()); + + copyItemParameters(copy); + copy->mOriginalLine = this->mOriginalLine; copy->mOriginalWidth = this->mOriginalWidth; copy->mIsNominalLine = this->mIsNominalLine; @@ -152,23 +155,6 @@ UBItem* UBGraphicsPolygonItem::deepCopy() const } -UBGraphicsPolygonItem* UBGraphicsPolygonItem::deepCopy(const QPolygonF& pol) const -{ - QPolygonF p(pol); - if (parentItem()!=NULL) - { - p = mapToItem(parentItem(), p); - } - UBGraphicsPolygonItem* copy = new UBGraphicsPolygonItem(p, parentItem()); - - copyItemParameters(copy); - - // TODO UB 4.7 ... complete all members ? - - return copy; - -} - void UBGraphicsPolygonItem::copyItemParameters(UBItem *copy) const { UBGraphicsPolygonItem *cp = dynamic_cast(copy); diff --git a/src/domain/UBGraphicsPolygonItem.h b/src/domain/UBGraphicsPolygonItem.h index 1917e731..7b961e52 100644 --- a/src/domain/UBGraphicsPolygonItem.h +++ b/src/domain/UBGraphicsPolygonItem.h @@ -87,8 +87,6 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem virtual UBItem* deepCopy() const; - // optimisation (eraser) - UBGraphicsPolygonItem* deepCopy(const QPolygonF& pol) const; virtual void copyItemParameters(UBItem *copy) const; QLineF originalLine() { return mOriginalLine;} diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 9e88e124..fbac6ef1 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -740,6 +740,63 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth, } } +void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) +{ + const QLineF line(mPreviousPoint, pEndPoint); + mPreviousPoint = pEndPoint; + + const QPolygonF eraserPolygon = UBGeometryUtils::lineToPolygon(line, pWidth); + const QRectF eraserBoundingRect = eraserPolygon.boundingRect(); + + QPainterPath eraserPath; + eraserPath.addPolygon(eraserPolygon); + + // Get all the items that are intersecting with the eraser path + QList collidItems = items(eraserBoundingRect, Qt::IntersectsItemBoundingRect); + + QList intersectedItems; + QList intersectedPolygons; + + #pragma omp parallel for + for(int i=0; i(collidItems[i]); + if(pi == NULL) + continue; + + QPainterPath itemPainterPath; + itemPainterPath.addPolygon(pi->sceneTransform().map(pi->polygon())); + if (eraserPath.contains(itemPainterPath)) + { + // Compele remove item + intersectedItems << pi; + intersectedPolygons << QPolygonF(); + } + else if (eraserPath.intersects(itemPainterPath)) + { + QPainterPath newPath = itemPainterPath.subtracted(eraserPath); + intersectedItems << pi; + intersectedPolygons << newPath.simplified().toFillPolygon(pi->sceneTransform().inverted()); + } + } + + for(int i=0; isetPolygon(intersectedPolygons[i]); + } + } + + if (!intersectedItems.empty()) + setModified(true); +} + +/* void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) { const QLineF line(mPreviousPoint, pEndPoint); @@ -810,7 +867,6 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) collidingPath.addPolygon(collidingPolygon); // Then we substract the eraser path to the polygon and we simplify it - /**/ QTransform polyTransform = collidingPolygonItem->sceneTransform().inverted(); QPointF mTrPrevPoint = polyTransform.map(mPreviousPoint); QPointF mTrEndPoint = polyTransform.map(pEndPoint); @@ -821,18 +877,18 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) QPainterPath trEraser; trEraser.addPolygon(trEraserPolygon); QPainterPath croppedPath = collidingPath.subtracted(trEraser); - /**/ // Original //QPainterPath croppedPath = collidingPath.subtracted(eraserPath); QPainterPath croppedPathSimplified = croppedPath.simplified(); - /*if (croppedPath == collidingPath) - { - // NOOP - toBeRemovedItems << collidingPolygonItem; - } - else */if (croppedPathSimplified.isEmpty()) + //if (croppedPath == collidingPath) + //{ + // // NOOP + // toBeRemovedItems << collidingPolygonItem; + //} + //else + if (croppedPathSimplified.isEmpty()) { #pragma omp critical // Put the entire polygon into the remove list if the eraser removes all its visible content @@ -948,6 +1004,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) mPreviousPoint = pEndPoint; } +*/ void UBGraphicsScene::drawArcTo(const QPointF& pCenterPoint, qreal pSpanAngle) { From 2e7efcd568d549418313ac7892e88ca8a8ee0808 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 24 Aug 2012 19:56:20 +0300 Subject: [PATCH 14/16] erasers performance: pragmas --- src/domain/UBGraphicsScene.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index fbac6ef1..27d5e402 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -768,15 +768,21 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) itemPainterPath.addPolygon(pi->sceneTransform().map(pi->polygon())); if (eraserPath.contains(itemPainterPath)) { - // Compele remove item - intersectedItems << pi; - intersectedPolygons << QPolygonF(); + #pragma omp critical + { + // Compele remove item + intersectedItems << pi; + intersectedPolygons << QPolygonF(); + } } else if (eraserPath.intersects(itemPainterPath)) { QPainterPath newPath = itemPainterPath.subtracted(eraserPath); - intersectedItems << pi; - intersectedPolygons << newPath.simplified().toFillPolygon(pi->sceneTransform().inverted()); + #pragma omp critical + { + intersectedItems << pi; + intersectedPolygons << newPath.simplified().toFillPolygon(pi->sceneTransform().inverted()); + } } } From a289545da97495e2b48dc890f090a389a9f37c88 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 24 Aug 2012 18:56:21 +0300 Subject: [PATCH 15/16] Cleared unused code --- src/domain/UBGraphicsScene.cpp | 210 --------------------------------- 1 file changed, 210 deletions(-) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 27d5e402..52ab6418 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -802,216 +802,6 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) setModified(true); } -/* -void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth) -{ - const QLineF line(mPreviousPoint, pEndPoint); - - const QPolygonF eraserPolygon = UBGeometryUtils::lineToPolygon(line, pWidth); - const QRectF eraserBoundingRect = eraserPolygon.boundingRect(); - const QRectF eraserInnerRect = UBGeometryUtils::lineToInnerRect(line, pWidth); - - QPainterPath eraserPathVar; - eraserPathVar.addPolygon(eraserPolygon); - const QPainterPath eraserPath = eraserPathVar; - - // Get all the items that are intersecting with the eraser path - QList collidItems = items(eraserBoundingRect, Qt::IntersectsItemBoundingRect); - - if(eDrawingMode_Vector == UBDrawingController::drawingController()->drawingMode()){ - // NOTE: I decided to reuse the 'artistic' eraser all the time in order to have a better eraser - // For this reason, the following code is not used but we will keep it for now, in case of - // futur requirements. - foreach(QGraphicsItem* poly, collidItems){ - UBGraphicsStrokesGroup* pGroup = dynamic_cast(poly); - if(NULL != pGroup){ - // TODO: Ungroup the item, put back the polygons on the scene, deal with the - // eraser's bounding rect, remove the polygons that must be removed - // then create new groups. - - // Get all substrokes and verify if they are part of the eraserpath then deal with it - foreach(QGraphicsItem* item, poly->childItems()){ - UBGraphicsPolygonItem* polygon = dynamic_cast(item); - if(NULL != polygon){ - if(eraserBoundingRect.intersects(polygon->boundingRect())){ - pGroup->removeFromGroup(polygon); - removeItem(polygon); - } - } - } - } - } - }else{ - QSet toBeAddedItems; - QSet toBeRemovedItems; - int collidItemsSize = collidItems.size(); - toBeAddedItems.reserve(collidItemsSize); - toBeRemovedItems.reserve(collidItemsSize); - - if (mShouldUseOMP) - { - #pragma omp parallel for - for (int i = 0; i < collidItemsSize; i++) - { - UBGraphicsPolygonItem *collidingPolygonItem = qgraphicsitem_cast(collidItems.at(i)); - if(NULL != collidingPolygonItem) - { - UBGraphicsStrokesGroup* pGroup = collidingPolygonItem->strokesGroup(); - - if(eraserInnerRect.contains(collidingPolygonItem->boundingRect())) - { - #pragma omp critical - // Put the entire polygon into the remove list - toBeRemovedItems << collidingPolygonItem; - } - else - { - // Here we get the polygon of the colliding item - - QPolygonF collidingPolygon = collidingPolygonItem->polygon(); - QPainterPath collidingPath; - collidingPath.addPolygon(collidingPolygon); - - // Then we substract the eraser path to the polygon and we simplify it - QTransform polyTransform = collidingPolygonItem->sceneTransform().inverted(); - QPointF mTrPrevPoint = polyTransform.map(mPreviousPoint); - QPointF mTrEndPoint = polyTransform.map(pEndPoint); - - const QLineF trLine(mTrPrevPoint, mTrEndPoint); - const QPolygonF trEraserPolygon = UBGeometryUtils::lineToPolygon(trLine, pWidth); - - QPainterPath trEraser; - trEraser.addPolygon(trEraserPolygon); - QPainterPath croppedPath = collidingPath.subtracted(trEraser); - - // Original - //QPainterPath croppedPath = collidingPath.subtracted(eraserPath); - QPainterPath croppedPathSimplified = croppedPath.simplified(); - - //if (croppedPath == collidingPath) - //{ - // // NOOP - // toBeRemovedItems << collidingPolygonItem; - //} - //else - if (croppedPathSimplified.isEmpty()) - { - #pragma omp critical - // Put the entire polygon into the remove list if the eraser removes all its visible content - toBeRemovedItems << collidingPolygonItem; - } - else - { - // Then we convert the remaining path to a list of polygons that will be converted in - // UBGraphicsPolygonItems and added to the scene - foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons()) - { - UBGraphicsPolygonItem* croppedPolygonItem; - #pragma omp critical - { - croppedPolygonItem = collidingPolygonItem->deepCopy(pol); - - if(NULL != pGroup){ - croppedPolygonItem->setStrokesGroup(pGroup); - //pGroup->addToGroup(croppedPolygonItem); - } - // Add this new polygon to the 'added' list - toBeAddedItems << croppedPolygonItem; - } - } - #pragma omp critical - // Remove the original polygonitem because it has been replaced by many smaller polygons - toBeRemovedItems << collidingPolygonItem; - } - } - } - } - } - else - { - for (int i = 0; i < collidItemsSize; i++) - { - UBGraphicsPolygonItem *collidingPolygonItem = dynamic_cast (collidItems.at(i)); - - if (collidingPolygonItem) - { - UBGraphicsStrokesGroup* pGroup = collidingPolygonItem->strokesGroup(); - - if(eraserInnerRect.contains(collidingPolygonItem->boundingRect())) - { - toBeRemovedItems << collidingPolygonItem; - } - else - { - QPolygonF collidingPolygon = collidingPolygonItem->polygon(); - QPainterPath collidingPath; - collidingPath.addPolygon(collidingPolygon); - - QPainterPath croppedPath = collidingPath.subtracted(eraserPath); - QPainterPath croppedPathSimplified = croppedPath.simplified(); - - if (croppedPath == collidingPath) - { - // NOOP - } - else if (croppedPathSimplified.isEmpty()) - { - toBeRemovedItems << collidingPolygonItem; - } - else - { - foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons()) - { - UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol); - toBeAddedItems << croppedPolygonItem; - if(NULL != pGroup){ - croppedPolygonItem->setStrokesGroup(pGroup); - } - } - - toBeRemovedItems << collidingPolygonItem; - } - } - } - } - } - - if(eDrawingMode_Vector == DRAWING_MODE && !UBDrawingController::drawingController()->isInDesktopMode()){ - foreach(QGraphicsItem* item, toBeRemovedItems){ - UBGraphicsPolygonItem* poly = dynamic_cast(item); - if(NULL != poly){ - UBGraphicsStrokesGroup* group = poly->strokesGroup(); - if(NULL != group){ - group->removeFromGroup(poly); - removeItem(poly); - }else{ - qDebug() << "No group present"; - } - } - } - }else{ - removeItems(toBeRemovedItems); - mRemovedItems += toBeRemovedItems; - } - - if(eDrawingMode_Vector == DRAWING_MODE && !UBDrawingController::drawingController()->isInDesktopMode()){ - foreach(QGraphicsItem* item, toBeAddedItems){ - UBGraphicsPolygonItem* poly = dynamic_cast(item); - if(NULL != poly && NULL != poly->strokesGroup()){ - poly->setTransform(poly->strokesGroup()->transform()); - poly->strokesGroup()->addToGroup(poly); - } - } - }else{ - addItems(toBeAddedItems); - mAddedItems += toBeAddedItems; - } - } - - mPreviousPoint = pEndPoint; -} -*/ - void UBGraphicsScene::drawArcTo(const QPointF& pCenterPoint, qreal pSpanAngle) { mDrawWithCompass = true; From f2252033a4ed766406c7290502f0d6c224ab159c Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 27 Aug 2012 11:24:00 +0300 Subject: [PATCH 16/16] Mouse events handlers works for UB types and for some Qt types. Mouse events for other items hanlded by QGraphicsView. It solves some troubles with items selections and fixes Sankore-721. --- src/board/UBBoardView.cpp | 37 ++++++++++++++++++++++--------------- src/core/UB.h | 3 ++- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index dc782e66..c2701f10 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -446,27 +446,32 @@ void UBBoardView::handleItemsSelection(QGraphicsItem *item) return; // delegate buttons shouldn't selected - if (DelegateButton::Type == movingItem->type()) + if (DelegateButton::Type == item->type()) return; // click on svg items (images on Frame) shouldn't change selection. - if (QGraphicsSvgItem::Type == movingItem->type()) + if (QGraphicsSvgItem::Type == item->type()) return; // Delegate frame shouldn't selected - if (UBGraphicsDelegateFrame::Type == movingItem->type()) + if (UBGraphicsDelegateFrame::Type == item->type()) return; // if we need to uwe multiple selection - we shouldn't deselect other items. if (!mMultipleSelectionIsEnabled) { - // if Item can be selected at mouse press - then we need to deselect all other items. - foreach(QGraphicsItem *iter_item, scene()->selectedItems()) + // here we need to determine what item is pressed. We should work + // only with UB items. + if ((UBGraphicsItemType::UserTypesCount > item->type()) && (item->type() > QGraphicsItem::UserType)) { - if (iter_item != item) + // if Item can be selected at mouse press - then we need to deselect all other items. + foreach(QGraphicsItem *iter_item, scene()->selectedItems()) { - iter_item->setSelected(false); + if (iter_item != item) + { + iter_item->setSelected(false); + } } } } @@ -495,6 +500,10 @@ Here we determines cases when items should to get mouse press event at pressing switch(item->type()) { + case UBGraphicsDelegateFrame::Type: + case QGraphicsSvgItem::Type: + return true; + case DelegateButton::Type: case UBGraphicsMediaItem::Type: return false; @@ -521,6 +530,7 @@ Here we determines cases when items should to get mouse press event at pressing return true; break; + case QGraphicsWebView::Type: case UBGraphicsWidgetItem::Type: if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected()) return true; @@ -529,9 +539,6 @@ Here we determines cases when items should to get mouse press event at pressing if (currentTool == UBStylusTool::Play) return true; break; - - default: - return true; } return false; @@ -561,12 +568,12 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item) case DelegateButton::Type: case UBGraphicsMediaItem::Type: return true; - - default: - return false; } - return false; + if (!dynamic_cast(item)) + return true; + else + return false; } bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) @@ -1066,7 +1073,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) else if (movingItem) { - if (suspendedMousePressEvent && !movingItem->data(UBGraphicsItemData::ItemLocked).toBool()) + if (suspendedMousePressEvent) { QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop movingItem = NULL; diff --git a/src/core/UB.h b/src/core/UB.h index bc3bd890..716df59c 100644 --- a/src/core/UB.h +++ b/src/core/UB.h @@ -147,7 +147,8 @@ struct UBGraphicsItemType cacheItemType, groupContainerType, ToolWidgetItemType, - GraphicsWidgetItemType + GraphicsWidgetItemType, + UserTypesCount // this line must be the last line in this enum because it is types counter. }; };