diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index d4c920af..18c433e9 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -853,7 +853,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsAppleWidgetItem* appleWidgetItem = graphicsAppleWidgetFromSvg(); if (appleWidgetItem) { - appleWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true); + // appleWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true); appleWidgetItem->setFlag(QGraphicsItem::ItemIsSelectable, true); appleWidgetItem->resize(foreignObjectWidth, foreignObjectHeight); @@ -877,7 +877,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (w3cWidgetItem) { - w3cWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true); + // w3cWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true); w3cWidgetItem->setFlag(QGraphicsItem::ItemIsSelectable, true); w3cWidgetItem->resize(foreignObjectWidth, foreignObjectHeight); @@ -1000,27 +1000,27 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() { UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem(); - QMultiMap strokesGroupsContainer; - QList groupContainer; + QMultiMap strokesGroupsContainer; + QList groupContainer; QString currentStrokeIdentifier; - + QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString()); mXmlReader.readNext(); - while (!mXmlReader.atEnd()) + while (!mXmlReader.atEnd()) { if (mXmlReader.isEndElement()) { mXmlReader.readNext(); break; } else if (mXmlReader.isStartElement()) { - if (mXmlReader.name() == tGroup) + if (mXmlReader.name() == tGroup) { qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId); UBGraphicsGroupContainerItem *curGroup = readGroup(); - if (curGroup) + if (curGroup) groupContainer.append(curGroup); - } + } else if (mXmlReader.name() == tElement) { QString id = mXmlReader.attributes().value(aId).toString(); @@ -1460,7 +1460,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) QVector dataStorageItems; if(elements.value("teacherGuide")) - dataStorageItems = elements.value("teacherGuide")->save(pageIndex); + dataStorageItems = elements.value("teacherGuide")->save(pageIndex); foreach(tIDataStorage* eachItem, dataStorageItems){ if(eachItem->type == eElementType_START){ mXmlWriter.writeStartElement(eachItem->name); @@ -2294,7 +2294,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::videoItemToLinkedVideo(UBGraphicsMed videoFileHref = UBFileSystemUtils::removeLocalFilePrefix(videoFileHref); if(videoFileHref.startsWith(mDocumentPath)) videoFileHref = videoFileHref.replace(mDocumentPath + "/",""); - + mXmlWriter.writeAttribute(nsXLink, "href", videoFileHref); mXmlWriter.writeEndElement(); } diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index ef87022b..bb184956 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -119,7 +119,6 @@ void UBGraphicsWidgetItem::initialize() void UBGraphicsWidgetItem::onLinkClicked(const QUrl& url) { - //UBApplication::webController->loadUrl(url); load(url); }