diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 227ed6aab..08c842102 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2086,7 +2086,7 @@ void MainWindow::ActionDetails(bool checked) mode = Draw::Modeling; SetEnableTool(true); SetEnableWidgets(true); - ui->toolBox->setCurrentIndex(4); + ui->toolBox->setCurrentIndex(5); if (qApp->patternType() == MeasurementsType::Standard) { @@ -2161,7 +2161,7 @@ void MainWindow::ActionLayout(bool checked) mode = Draw::Layout; SetEnableTool(true); SetEnableWidgets(true); - ui->toolBox->setCurrentIndex(5); + ui->toolBox->setCurrentIndex(6); mouseCoordinate->setText(""); @@ -3042,6 +3042,7 @@ void MainWindow::SetEnableTool(bool enable) ui->toolButtonPointFromArcAndTangent->setEnabled(drawTools); ui->toolButtonArcWithLength->setEnabled(drawTools); ui->toolButtonTrueDarts->setEnabled(drawTools); + ui->toolButtonGroup->setEnabled(drawTools); ui->actionLast_tool->setEnabled(drawTools); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 90c9bb8a7..fdb501f67 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -48,14 +48,14 @@ Tools - 2 + 4 0 0 - 100 + 130 318 @@ -375,7 +375,7 @@ 0 0 - 100 + 130 58 @@ -700,7 +700,7 @@ 0 0 - 100 + 130 196 @@ -937,12 +937,52 @@ + + + + :/icon/16x16/operations.png:/icon/16x16/operations.png + + + Operations + + + Operations + + + + + + false + + + Create new group + + + ... + + + + :/toolicon/32x32/group_plus.png:/toolicon/32x32/group_plus.png + + + + 32 + 32 + + + + true + + + + + 0 0 - 100 + 130 58 @@ -1028,8 +1068,8 @@ 0 0 - 87 - 58 + 130 + 356 diff --git a/src/app/valentina/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc index 772aa06a7..8b5d0bec5 100644 --- a/src/app/valentina/share/resources/toolicon.qrc +++ b/src/app/valentina/share/resources/toolicon.qrc @@ -62,5 +62,7 @@ toolicon/32x32/cubic_bezier@2x.png toolicon/32x32/cubic_bezier_path.png toolicon/32x32/cubic_bezier_path@2x.png + toolicon/32x32/group_plus.png + toolicon/32x32/group_plus@2x.png diff --git a/src/app/valentina/share/resources/toolicon/32x32/group_plus.png b/src/app/valentina/share/resources/toolicon/32x32/group_plus.png new file mode 100644 index 000000000..4b00755f0 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/group_plus.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png b/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png new file mode 100644 index 000000000..7b9c63a74 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/svg/group_plus.svg b/src/app/valentina/share/resources/toolicon/svg/group_plus.svg new file mode 100644 index 000000000..92243882d --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/group_plus.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc index ed0dec1b4..3d273e73d 100644 --- a/src/libs/vmisc/share/resources/icon.qrc +++ b/src/libs/vmisc/share/resources/icon.qrc @@ -55,5 +55,7 @@ icon/16x16/toolsectioncurve@2x.png icon/16x16/toolsectionline@2x.png icon/16x16/toolsectionpoint@2x.png + icon/16x16/operations.png + icon/16x16/operations@2x.png diff --git a/src/libs/vmisc/share/resources/icon/16x16/operations.png b/src/libs/vmisc/share/resources/icon/16x16/operations.png new file mode 100644 index 000000000..76e5e17fe Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/operations.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/operations@2x.png b/src/libs/vmisc/share/resources/icon/16x16/operations@2x.png new file mode 100644 index 000000000..a8becf80c Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/operations@2x.png differ