diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 0582f8da..0ce11f87 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1637,7 +1637,8 @@ - :/images/toolbar/library.png:/images/toolbar/library.png + :/images/toolbar/group.png + :/images/toolbar/ungroup.png:/images/toolbar/group.png Group Items diff --git a/resources/images/cursors/play.png b/resources/images/cursors/play.png new file mode 100644 index 00000000..25030dd1 Binary files /dev/null and b/resources/images/cursors/play.png differ diff --git a/resources/images/stylusPalette/handPlay.png b/resources/images/stylusPalette/handPlay.png index 999f7703..186c81da 100644 Binary files a/resources/images/stylusPalette/handPlay.png and b/resources/images/stylusPalette/handPlay.png differ diff --git a/resources/images/stylusPalette/handPlayOn.png b/resources/images/stylusPalette/handPlayOn.png index 9191cffa..5b86d97e 100644 Binary files a/resources/images/stylusPalette/handPlayOn.png and b/resources/images/stylusPalette/handPlayOn.png differ diff --git a/resources/images/toolbar/group.png b/resources/images/toolbar/group.png new file mode 100644 index 00000000..95dbf738 Binary files /dev/null and b/resources/images/toolbar/group.png differ diff --git a/resources/images/toolbar/ungroup.png b/resources/images/toolbar/ungroup.png new file mode 100644 index 00000000..48f229a9 Binary files /dev/null and b/resources/images/toolbar/ungroup.png differ diff --git a/resources/images/z_layer_down.svg b/resources/images/z_layer_down.svg new file mode 100644 index 00000000..02908437 --- /dev/null +++ b/resources/images/z_layer_down.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + + + + + + diff --git a/resources/images/z_layer_up.svg b/resources/images/z_layer_up.svg new file mode 100644 index 00000000..746b6c9a --- /dev/null +++ b/resources/images/z_layer_up.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + + + + + + diff --git a/resources/sankore.qrc b/resources/sankore.qrc index d07c048f..d9263dbd 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -42,6 +42,8 @@ images/currentDocument.png images/minus.svg images/plus.svg + images/z_layer_up.svg + images/z_layer_down.svg images/trash.png images/pin.svg images/unpin.svg @@ -49,6 +51,8 @@ images/reload.svg images/frozen.svg images/unfrozen.svg + images/toolbar/group.png + images/toolbar/ungroup.png images/toolbar/window.png images/toolbar/plusBlack.png images/toolbar/plusBlackOn.png @@ -183,6 +187,7 @@ images/cursors/resize.png images/cursors/drawCompass.png images/cursors/drawRulerLine.png + images/cursors/play.png images/print/onepage.png images/print/thumbnails.png images/print/twopages.png diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 1e347acc..c3a47261 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -637,6 +637,12 @@ void UBBoardView::rubberItems() { if (mUBRubberBand) mRubberedItems = items(mUBRubberBand->geometry()); + + foreach(QGraphicsItem *item, mRubberedItems) + { + if (item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type()) + mRubberedItems.removeOne(item); + } } void UBBoardView::moveRubberedItems(QPointF movingVector) @@ -945,7 +951,9 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) } else { - movingItem->setSelected(true); + if ( QGraphicsSvgItem::Type != movingItem->type() + && UBGraphicsDelegateFrame::Type != movingItem->type()) + movingItem->setSelected(true); } } @@ -1360,7 +1368,7 @@ UBBoardView::setToolCursor (int tool) controlViewport->setCursor (UBResources::resources ()->arrowCursor); break; case UBStylusTool::Play: - controlViewport->setCursor (UBResources::resources ()->drawLineRulerCursor); + controlViewport->setCursor (UBResources::resources ()->playCursor); break; case UBStylusTool::Line: controlViewport->setCursor (UBResources::resources ()->penCursor); diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index d48c30dc..e4a7f747 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -137,12 +137,12 @@ void UBGraphicsItemDelegate::init() connect(mMenuButton, SIGNAL(clicked()), this, SLOT(showMenu())); mButtons << mMenuButton; - mZOrderUpButton = new DelegateButton(":/images/plus.svg", mDelegated, mFrame, Qt::BottomLeftSection); + mZOrderUpButton = new DelegateButton(":/images/z_layer_up.svg", mDelegated, mFrame, Qt::BottomLeftSection); connect(mZOrderUpButton, SIGNAL(clicked()), this, SLOT(increaseZLevelUp())); connect(mZOrderUpButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelTop())); mButtons << mZOrderUpButton; - mZOrderDownButton = new DelegateButton(":/images/minus.svg", mDelegated, mFrame, Qt::BottomLeftSection); + mZOrderDownButton = new DelegateButton(":/images/z_layer_down.svg", mDelegated, mFrame, Qt::BottomLeftSection); connect(mZOrderDownButton, SIGNAL(clicked()), this, SLOT(increaseZLevelDown())); connect(mZOrderDownButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelBottom())); mButtons << mZOrderDownButton; diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp index 0bcad20d..191480f0 100644 --- a/src/gui/UBResources.cpp +++ b/src/gui/UBResources.cpp @@ -60,6 +60,7 @@ void UBResources::init() zoomInCursor = QCursor(QPixmap(":/images/cursors/zoomIn.png"), 9, 9); zoomOutCursor = QCursor(QPixmap(":/images/cursors/zoomOut.png"), 9, 9); arrowCursor = QCursor(Qt::ArrowCursor); + playCursor = QCursor(QPixmap(":/images/cursors/play.png"), 6, 1); textCursor = QCursor(Qt::ArrowCursor); rotateCursor = QCursor(QPixmap(":/images/cursors/rotate.png"), 16, 16); drawLineRulerCursor = QCursor(QPixmap(":/images/cursors/drawRulerLine.png"), 3, 12); diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h index fcba66e3..66a61880 100644 --- a/src/gui/UBResources.h +++ b/src/gui/UBResources.h @@ -47,6 +47,7 @@ class UBResources : public QObject QCursor zoomInCursor; QCursor zoomOutCursor; QCursor arrowCursor; + QCursor playCursor; QCursor textCursor; QCursor rotateCursor; QCursor drawLineRulerCursor;