From 5ffb64de431a1314950dde7d7d88185de05d1111 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 30 Apr 2012 11:40:33 +0200 Subject: [PATCH 1/2] Backup of the strokes as objects --- src/adaptors/UBSvgSubsetAdaptor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index c616ae66..86ade4c9 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -428,7 +428,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() } else if (mXmlReader.name() == "g") { - // Create new stroke, if its NULL or already has poligons + // Create new stroke, if its NULL or already has polygons if (annotationGroup) { if (!annotationGroup->polygons().empty()) @@ -437,8 +437,9 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() else annotationGroup = new UBGraphicsStroke(); - if(eDrawingMode_Vector == dc->drawingMode()){ + if(eDrawingMode_Vector == dc->drawingMode()){ strokesGroup = new UBGraphicsStrokesGroup(); + graphicsItemFromSvg(strokesGroup); } QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value"); @@ -485,6 +486,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if(eDrawingMode_Vector == dc->drawingMode()){ if(strokesGroup){ + polygonItem->setTransform(strokesGroup->transform()); strokesGroup->addToGroup(polygonItem); } }else{ @@ -510,6 +512,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if(eDrawingMode_Vector == dc->drawingMode()){ if(strokesGroup){ + polygonItem->setTransform(strokesGroup->transform()); strokesGroup->addToGroup(polygonItem); } }else{ @@ -838,6 +841,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { if(strokesGroup && scene){ scene->addItem(strokesGroup); + //graphicsItemFromSvg(strokesGroup); } if (annotationGroup) From c2b9c6a412094b4df56834ef4cdcafa1a0f8c637 Mon Sep 17 00:00:00 2001 From: Anna Udovichenko Date: Mon, 30 Apr 2012 15:33:14 +0300 Subject: [PATCH 2/2] Added elements selection --- src/board/UBFeaturesController.cpp | 9 ++++++++- src/gui/UBFeaturesWidget.cpp | 22 ++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 863606da..0e34c595 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -315,7 +315,14 @@ UBFeature UBFeaturesController::newFolder( const QString &name ) void UBFeaturesController::addItemToPage(const UBFeature &item) { - UBApplication::boardController->downloadURL( QUrl::fromLocalFile( item.getFullPath() ) ); + if ( item.getType() == FEATURE_INTERNAL ) + { + UBApplication::boardController->downloadURL( QUrl( item.getFullPath() ) ); + } + else + { + UBApplication::boardController->downloadURL( QUrl::fromLocalFile( item.getFullPath() ) ); + } } UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeature &destination ) diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index e3affd5c..e7f1520a 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -49,6 +49,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale //featuresListView->setStyleSheet( QString("background: #EEEEEE;border-radius: 10px;border: 2px solid #999999;") ); featuresListView->setDragDropMode( QAbstractItemView::DragDrop ); + featuresListView->setSelectionMode( QAbstractItemView::ContiguousSelection ); featuresListView->setModel( featuresProxyModel ); featuresListView->setResizeMode( QListView::Adjust ); @@ -72,7 +73,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale pathListView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); //pathListView->setResizeMode( QListView::Adjust ); //pathListView->setMovement( QListView::Static ); - pathListView->setDragDropMode( QAbstractItemView::DragDrop ); + pathListView->setDragDropMode( QAbstractItemView::DropOnly ); pathScene = new QGraphicsScene(this); //pathViewer = new UBFeaturesPathViewer( QPixmap(":images/libpalette/home.png"), controller->getRootPath(), pathScene, this ); @@ -629,7 +630,24 @@ Qt::ItemFlags UBFeaturesModel::flags( const QModelIndex &index ) const return defaultFlags | Qt::ItemIsDropEnabled; else return defaultFlags; } - return defaultFlags | Qt::ItemIsDropEnabled; + /*if ( index.isValid() ) + { + UBFeature item = index.data( Qt::UserRole + 1 ).value(); + switch( item.getType() ) + { + case FEATURE_CATEGORY: + case FEATURE_FOLDER: + case FEATURE_FAVORITE: + case FEATURE_TRASH: + return Qt::ItemIsDropEnabled | Qt::ItemIsEnabled; + case FEATURE_INTERACTIVE: + case FEATURE_INTERNAL: + case FEATURE_ITEM: + return Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsSelectable; + default:; + } + }*/ + return defaultFlags; }