From c6a09f4555a5141cd6963e101ef0ca02a410c988 Mon Sep 17 00:00:00 2001 From: -f Date: Fri, 20 Dec 2013 10:16:17 +0100 Subject: [PATCH] new icons for un/grouping items --- resources/OpenBoard.qrc | 2 + resources/images/groupItems.svg | 250 ++++++++++++++ resources/images/ungroupItems.svg | 311 ++++++++++++++++++ .../UBGraphicsGroupContainerItemDelegate.cpp | 2 +- src/domain/UBSelectionFrame.cpp | 2 +- 5 files changed, 565 insertions(+), 2 deletions(-) create mode 100644 resources/images/groupItems.svg create mode 100644 resources/images/ungroupItems.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 1165e976..e1a44529 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -350,5 +350,7 @@ images/centerAligned.svg images/leftAligned.svg images/notAligned.svg + images/groupItems.svg + images/ungroupItems.svg diff --git a/resources/images/groupItems.svg b/resources/images/groupItems.svg new file mode 100644 index 00000000..0d647fe4 --- /dev/null +++ b/resources/images/groupItems.svg @@ -0,0 +1,250 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/images/ungroupItems.svg b/resources/images/ungroupItems.svg new file mode 100644 index 00000000..58354222 --- /dev/null +++ b/resources/images/ungroupItems.svg @@ -0,0 +1,311 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp index 2be700f0..2c24be42 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp @@ -71,7 +71,7 @@ void UBGraphicsGroupContainerItemDelegate::decorateMenu(QMenu *menu) void UBGraphicsGroupContainerItemDelegate::buildButtons() { if (!mDestroyGroupButton) { - mDestroyGroupButton = new DelegateButton(":/images/minus.svg", mDelegated, mFrame, Qt::TopLeftSection); + mDestroyGroupButton = new DelegateButton(":/images/ungroupItems.svg", mDelegated, mFrame, Qt::TopLeftSection); mDestroyGroupButton->setShowProgressIndicator(false); connect(mDestroyGroupButton, SIGNAL(clicked()), this, SLOT(destroyGroup())); mButtons << mDestroyGroupButton; diff --git a/src/domain/UBSelectionFrame.cpp b/src/domain/UBSelectionFrame.cpp index 36f6a93f..72708dca 100644 --- a/src/domain/UBSelectionFrame.cpp +++ b/src/domain/UBSelectionFrame.cpp @@ -477,7 +477,7 @@ QList UBSelectionFrame::buttonsForFlags(UBGraphicsFlags fls) { if (mEnclosedtems.count() >= 1) { if (!mGroupButton) { - mGroupButton = new DelegateButton(":/images/plus.svg", this, 0, Qt::TopLeftSection); + mGroupButton = new DelegateButton(":/images/groupItems.svg", this, 0, Qt::TopLeftSection); mGroupButton->setShowProgressIndicator(false); connect(mGroupButton, SIGNAL(clicked()), this, SLOT(groupItems())); }