aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issue826 improvement for the handling of groups with the same name

Browse Source 
--HG--
branch : feature
This commit is contained in:
Ronan Le Tiec 2018-03-25 20:01:36 +02:00
parent 6ce7ac1248
commit 67c0e7ed45
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/vtools/tools/drawTools/vdrawtool.h
View File

@ -164,7 +164,12 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI
{ {
QAction *actionAddToGroup = menuAddToGroup->addAction(list[i]); QAction *actionAddToGroup = menuAddToGroup->addAction(list[i]);
actionsAddToGroup->addAction(actionAddToGroup); actionsAddToGroup->addAction(actionAddToGroup);
actionAddToGroup->setData(groupsNotContainingItem.key(list[i])); const quint32 groupId = groupsNotContainingItem.key(list[i]);
actionAddToGroup->setData(groupId);
// removes the group we just treated, because we can have several group
// with the same name. Otherwise the groupId would always be the same
groupsNotContainingItem.remove(groupId);
} }
} }
@ -182,7 +187,9 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI
{ {
QAction *actionRemoveFromGroup = menuRemoveFromGroup->addAction(list[i]); QAction *actionRemoveFromGroup = menuRemoveFromGroup->addAction(list[i]);
actionsRemoveFromGroup->addAction(actionRemoveFromGroup); actionsRemoveFromGroup->addAction(actionRemoveFromGroup);
actionRemoveFromGroup->setData(groupsContainingItem.key(list[i])); const quint32 groupId = groupsContainingItem.key(list[i]);
actionRemoveFromGroup->setData(groupId);
groupsContainingItem.remove(groupId);
} }
} }