diff --git a/scripts/generate_tool_cursor.sh b/scripts/generate_tool_cursor.sh new file mode 100755 index 000000000..da7e142ba --- /dev/null +++ b/scripts/generate_tool_cursor.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# usage: +# $ ./generate_tool_cursor.sh + +PATTERN=*@2x.png +TOOLICONPATH=../src/app/valentina/share/resources/toolicon/32x32/ +TOOLICONS=`ls $TOOLICONPATH$PATTERN` +OUTPATH=../src/app/valentina/share/resources/cursor/svg + + +for var in $TOOLICONS +do + basename=${var##*/} + basename=${basename%.png} + basename=${basename%@2x} # remove optional @2x suffix + if [ ! -f $basename@2x.png ]; then # always prefere hidpi version + sed "s/<>/$basename@2x/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg + else + sed "s/<>/$basename/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg + fi +done diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 007b84b7c..f6246f6f4 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -560,7 +560,17 @@ void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cur CancelTool(); emit EnableItemMove(false); currentTool = lastUsedTool = t; - QPixmap pixmap(cursor); + auto cursorResource = cursor; + if (qApp->devicePixelRatio() >= 2) + { + // Try to load HiDPI versions of the cursors if availible + auto cursorHidpiResource = QString(cursor).replace(".png", "@2x.png"); + if (QFileInfo(cursorResource).exists()) + { + cursorResource = cursorHidpiResource; + } + } + QPixmap pixmap(cursorResource); QCursor cur(pixmap, 2, 3); ui->view->setCursor(cur); ui->view->setShowToolOptions(false); @@ -951,6 +961,17 @@ void MainWindow::ToolCurveIntersectAxis(bool checked) &MainWindow::ApplyDialog); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ToolArcIntersectAxis(bool checked) +{ + // Reuse ToolCurveIntersectAxis but with different cursor and tool tip + SetToolButtonWithApply(checked, Tool::CurveIntersectAxis, + ":/cursor/arc_intersect_axis_cursor.png", + tr("Select arc"), + &MainWindow::ClosedDialogWithApply, + &MainWindow::ApplyDialog); +} + //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolPointOfIntersectionArcs(bool checked) { @@ -1537,7 +1558,7 @@ void MainWindow::InitToolButtons() connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc); connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis); connect(ui->toolButtonCurveIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis); - connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis); + connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolArcIntersectAxis); connect(ui->toolButtonLayoutSettings, &QToolButton::clicked, this, &MainWindow::ToolLayoutSettings); connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this, &MainWindow::ToolPointOfIntersectionArcs); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 3411c3bc1..0aa106f60 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -122,6 +122,7 @@ public slots: void ToolCutArc(bool checked); void ToolLineIntersectAxis(bool checked); void ToolCurveIntersectAxis(bool checked); + void ToolArcIntersectAxis(bool checked); void ToolPointOfIntersectionArcs(bool checked); void ToolPointOfIntersectionCircles(bool checked); void ToolPointFromCircleAndTangent(bool checked); diff --git a/src/app/valentina/share/resources/cursor.qrc b/src/app/valentina/share/resources/cursor.qrc index 67adbf12b..45d4c9edd 100644 --- a/src/app/valentina/share/resources/cursor.qrc +++ b/src/app/valentina/share/resources/cursor.qrc @@ -30,5 +30,33 @@ cursor/point_from_arc_and_tangent_cursor.png cursor/arc_with_length_cursor.png cursor/true_darts_cursor.png + cursor/alongline_cursor@2x.png + cursor/arc_cursor@2x.png + cursor/arc_cut_cursor@2x.png + cursor/arc_intersect_axis_cursor@2x.png + cursor/arc_with_length_cursor@2x.png + cursor/bisector_cursor@2x.png + cursor/curve_intersect_axis_cursor@2x.png + cursor/endline_cursor@2x.png + cursor/height_cursor@2x.png + cursor/intersect_cursor@2x.png + cursor/line_cursor@2x.png + cursor/line_intersect_axis_cursor@2x.png + cursor/new_detail_cursor@2x.png + cursor/normal_cursor@2x.png + cursor/point_from_arc_and_tangent_cursor@2x.png + cursor/point_from_circle_and_tangent_cursor@2x.png + cursor/point_of_intersection_circles@2x.png + cursor/pointcontact_cursor@2x.png + cursor/pointofintersect_cursor@2x.png + cursor/shoulder_cursor@2x.png + cursor/spline_cursor@2x.png + cursor/spline_cut_point_cursor@2x.png + cursor/splinepath_cursor@2x.png + cursor/splinepath_cut_point_cursor@2x.png + cursor/true_darts_cursor@2x.png + cursor/union_cursor@2x.png + cursor/triangle_cursor@2x.png + cursor/point_of_intersection_arcs@2x.png diff --git a/src/app/valentina/share/resources/cursor/alongline_cursor.png b/src/app/valentina/share/resources/cursor/alongline_cursor.png index 6d89ed85a..e867fda39 100644 Binary files a/src/app/valentina/share/resources/cursor/alongline_cursor.png and b/src/app/valentina/share/resources/cursor/alongline_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/alongline_cursor@2x.png b/src/app/valentina/share/resources/cursor/alongline_cursor@2x.png new file mode 100644 index 000000000..89529fd52 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/alongline_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_cursor.png b/src/app/valentina/share/resources/cursor/arc_cursor.png index d8df571da..b599efb22 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_cursor.png and b/src/app/valentina/share/resources/cursor/arc_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_cursor@2x.png b/src/app/valentina/share/resources/cursor/arc_cursor@2x.png new file mode 100644 index 000000000..ada1b56e8 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/arc_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_cut_cursor.png b/src/app/valentina/share/resources/cursor/arc_cut_cursor.png index a1000e728..40c3fc531 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_cut_cursor.png and b/src/app/valentina/share/resources/cursor/arc_cut_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_cut_cursor@2x.png b/src/app/valentina/share/resources/cursor/arc_cut_cursor@2x.png new file mode 100644 index 000000000..f66cbcc01 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/arc_cut_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png index f57fc997b..100ad2391 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png and b/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor@2x.png b/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor@2x.png new file mode 100644 index 000000000..8d6176f4b Binary files /dev/null and b/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_with_length_cursor.png b/src/app/valentina/share/resources/cursor/arc_with_length_cursor.png index e904f36c0..74e3acef0 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_with_length_cursor.png and b/src/app/valentina/share/resources/cursor/arc_with_length_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/arc_with_length_cursor@2x.png b/src/app/valentina/share/resources/cursor/arc_with_length_cursor@2x.png new file mode 100644 index 000000000..d938ae488 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/arc_with_length_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/bisector_cursor.png b/src/app/valentina/share/resources/cursor/bisector_cursor.png index 72a8c71cb..bb3fdaaca 100644 Binary files a/src/app/valentina/share/resources/cursor/bisector_cursor.png and b/src/app/valentina/share/resources/cursor/bisector_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/bisector_cursor@2x.png b/src/app/valentina/share/resources/cursor/bisector_cursor@2x.png new file mode 100644 index 000000000..a0bec442b Binary files /dev/null and b/src/app/valentina/share/resources/cursor/bisector_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png index 56b941fc6..907cc2c3e 100644 Binary files a/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png and b/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor@2x.png b/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor@2x.png new file mode 100644 index 000000000..abcff7887 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/endline_cursor.png b/src/app/valentina/share/resources/cursor/endline_cursor.png index 0e12290c5..98d6b0dad 100644 Binary files a/src/app/valentina/share/resources/cursor/endline_cursor.png and b/src/app/valentina/share/resources/cursor/endline_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/endline_cursor@2x.png b/src/app/valentina/share/resources/cursor/endline_cursor@2x.png new file mode 100644 index 000000000..73d767c60 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/endline_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/height_cursor.png b/src/app/valentina/share/resources/cursor/height_cursor.png index 5a184bbd5..22e883173 100644 Binary files a/src/app/valentina/share/resources/cursor/height_cursor.png and b/src/app/valentina/share/resources/cursor/height_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/height_cursor@2x.png b/src/app/valentina/share/resources/cursor/height_cursor@2x.png new file mode 100644 index 000000000..ffceda0b4 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/height_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/intersect_cursor.png b/src/app/valentina/share/resources/cursor/intersect_cursor.png index 0ac97c25f..200e2a333 100644 Binary files a/src/app/valentina/share/resources/cursor/intersect_cursor.png and b/src/app/valentina/share/resources/cursor/intersect_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/intersect_cursor@2x.png b/src/app/valentina/share/resources/cursor/intersect_cursor@2x.png new file mode 100644 index 000000000..7def85920 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/intersect_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/line_cursor.png b/src/app/valentina/share/resources/cursor/line_cursor.png index 5e3e082c5..fd321005f 100644 Binary files a/src/app/valentina/share/resources/cursor/line_cursor.png and b/src/app/valentina/share/resources/cursor/line_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/line_cursor@2x.png b/src/app/valentina/share/resources/cursor/line_cursor@2x.png new file mode 100644 index 000000000..7b8eb07d0 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/line_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png index 931441bf3..f9c06174a 100644 Binary files a/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png and b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor@2x.png b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor@2x.png new file mode 100644 index 000000000..7c296227a Binary files /dev/null and b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/new_detail_cursor.png b/src/app/valentina/share/resources/cursor/new_detail_cursor.png index 1f01fc7b5..26c1a615b 100644 Binary files a/src/app/valentina/share/resources/cursor/new_detail_cursor.png and b/src/app/valentina/share/resources/cursor/new_detail_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/new_detail_cursor@2x.png b/src/app/valentina/share/resources/cursor/new_detail_cursor@2x.png new file mode 100644 index 000000000..330ee0ab7 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/new_detail_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/normal_cursor.png b/src/app/valentina/share/resources/cursor/normal_cursor.png index 4447df6d3..d13f2d04a 100644 Binary files a/src/app/valentina/share/resources/cursor/normal_cursor.png and b/src/app/valentina/share/resources/cursor/normal_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/normal_cursor@2x.png b/src/app/valentina/share/resources/cursor/normal_cursor@2x.png new file mode 100644 index 000000000..053e521da Binary files /dev/null and b/src/app/valentina/share/resources/cursor/normal_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png b/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png index 3ac10a3ef..f277b14d4 100644 Binary files a/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png and b/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor@2x.png b/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor@2x.png new file mode 100644 index 000000000..ad0ef5d09 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png index 0443f5ba4..f82603893 100644 Binary files a/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png and b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor@2x.png b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor@2x.png new file mode 100644 index 000000000..ea84f2e9e Binary files /dev/null and b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png index 3f4a9309a..ce3a983fe 100644 Binary files a/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png and b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png differ diff --git a/src/app/valentina/share/resources/cursor/point_of_intersection_arcs@2x.png b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs@2x.png new file mode 100644 index 000000000..adb8c6352 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png b/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png index db5b062c6..564c3c11d 100644 Binary files a/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png and b/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png differ diff --git a/src/app/valentina/share/resources/cursor/point_of_intersection_circles@2x.png b/src/app/valentina/share/resources/cursor/point_of_intersection_circles@2x.png new file mode 100644 index 000000000..3c4819826 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/point_of_intersection_circles@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/pointcontact_cursor.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png index b55664119..6f360942d 100644 Binary files a/src/app/valentina/share/resources/cursor/pointcontact_cursor.png and b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png new file mode 100644 index 000000000..c59175521 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/pointofintersect_cursor.png b/src/app/valentina/share/resources/cursor/pointofintersect_cursor.png index 8b54baa27..0aa56f9b4 100644 Binary files a/src/app/valentina/share/resources/cursor/pointofintersect_cursor.png and b/src/app/valentina/share/resources/cursor/pointofintersect_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/pointofintersect_cursor@2x.png b/src/app/valentina/share/resources/cursor/pointofintersect_cursor@2x.png new file mode 100644 index 000000000..1b3dc974d Binary files /dev/null and b/src/app/valentina/share/resources/cursor/pointofintersect_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/shoulder_cursor.png b/src/app/valentina/share/resources/cursor/shoulder_cursor.png index 976e59d5c..e6d006795 100644 Binary files a/src/app/valentina/share/resources/cursor/shoulder_cursor.png and b/src/app/valentina/share/resources/cursor/shoulder_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/shoulder_cursor@2x.png b/src/app/valentina/share/resources/cursor/shoulder_cursor@2x.png new file mode 100644 index 000000000..fe6e38ac9 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/shoulder_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/spline_cursor.png b/src/app/valentina/share/resources/cursor/spline_cursor.png index 34601a9e7..eb8b79328 100644 Binary files a/src/app/valentina/share/resources/cursor/spline_cursor.png and b/src/app/valentina/share/resources/cursor/spline_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/spline_cursor@2x.png b/src/app/valentina/share/resources/cursor/spline_cursor@2x.png new file mode 100644 index 000000000..14da02532 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/spline_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png b/src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png index 3807c178a..d2133a90d 100644 Binary files a/src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png and b/src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/spline_cut_point_cursor@2x.png b/src/app/valentina/share/resources/cursor/spline_cut_point_cursor@2x.png new file mode 100644 index 000000000..9fa69764c Binary files /dev/null and b/src/app/valentina/share/resources/cursor/spline_cut_point_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/splinepath_cursor.png b/src/app/valentina/share/resources/cursor/splinepath_cursor.png index 98c78ffb8..25cd1dd54 100644 Binary files a/src/app/valentina/share/resources/cursor/splinepath_cursor.png and b/src/app/valentina/share/resources/cursor/splinepath_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/splinepath_cursor@2x.png b/src/app/valentina/share/resources/cursor/splinepath_cursor@2x.png new file mode 100644 index 000000000..f22d3864a Binary files /dev/null and b/src/app/valentina/share/resources/cursor/splinepath_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png index 4e13ae25a..848d9a86c 100644 Binary files a/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png and b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor@2x.png b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor@2x.png new file mode 100644 index 000000000..2da6545c3 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/svg/template_cursor.svg b/src/app/valentina/share/resources/cursor/svg/template_cursor.svg new file mode 100644 index 000000000..5724a83a0 --- /dev/null +++ b/src/app/valentina/share/resources/cursor/svg/template_cursor.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/valentina/share/resources/cursor/triangle_cursor.png b/src/app/valentina/share/resources/cursor/triangle_cursor.png index e76f68d51..6fa1e8971 100644 Binary files a/src/app/valentina/share/resources/cursor/triangle_cursor.png and b/src/app/valentina/share/resources/cursor/triangle_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/triangle_cursor@2x.png b/src/app/valentina/share/resources/cursor/triangle_cursor@2x.png new file mode 100644 index 000000000..92b69aad4 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/triangle_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/true_darts_cursor.png b/src/app/valentina/share/resources/cursor/true_darts_cursor.png index 791ad9c18..2a072f4d3 100644 Binary files a/src/app/valentina/share/resources/cursor/true_darts_cursor.png and b/src/app/valentina/share/resources/cursor/true_darts_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/true_darts_cursor@2x.png b/src/app/valentina/share/resources/cursor/true_darts_cursor@2x.png new file mode 100644 index 000000000..8093a3273 Binary files /dev/null and b/src/app/valentina/share/resources/cursor/true_darts_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/union_cursor.png b/src/app/valentina/share/resources/cursor/union_cursor.png index 595067191..984f4cb65 100644 Binary files a/src/app/valentina/share/resources/cursor/union_cursor.png and b/src/app/valentina/share/resources/cursor/union_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/union_cursor@2x.png b/src/app/valentina/share/resources/cursor/union_cursor@2x.png new file mode 100644 index 000000000..f36baa01d Binary files /dev/null and b/src/app/valentina/share/resources/cursor/union_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc index 45c37ec85..1e9c85a8b 100644 --- a/src/app/valentina/share/resources/toolicon.qrc +++ b/src/app/valentina/share/resources/toolicon.qrc @@ -28,5 +28,35 @@ toolicon/32x32/new_detail.png toolicon/32x32/arc_with_length.png toolicon/32x32/true_darts.png + toolicon/32x32/along_line@2x.png + toolicon/32x32/arc_cut@2x.png + toolicon/32x32/arc_intersect_axis@2x.png + toolicon/32x32/arc_with_length@2x.png + toolicon/32x32/arc@2x.png + toolicon/32x32/bisector@2x.png + toolicon/32x32/curve_intersect_axis@2x.png + toolicon/32x32/height@2x.png + toolicon/32x32/intersect@2x.png + toolicon/32x32/line_intersect_axis@2x.png + toolicon/32x32/line@2x.png + toolicon/32x32/new_detail@2x.png + toolicon/32x32/normal@2x.png + toolicon/32x32/point_from_arc_and_tangent@2x.png + toolicon/32x32/point_from_circle_and_tangent@2x.png + toolicon/32x32/point_of_contact@2x.png + toolicon/32x32/point_of_intersection_arcs@2x.png + toolicon/32x32/point_of_intersection_circles@2x.png + toolicon/32x32/point_of_intersection@2x.png + toolicon/32x32/segment@2x.png + toolicon/32x32/shoulder@2x.png + toolicon/32x32/spline_cut_point@2x.png + toolicon/32x32/spline@2x.png + toolicon/32x32/splinePath_cut_point 2.png + toolicon/32x32/splinePath_cut_point copy.png + toolicon/32x32/splinePath_cut_point@2x.png + toolicon/32x32/splinePath@2x.png + toolicon/32x32/true_darts@2x.png + toolicon/32x32/union@2x.png + toolicon/32x32/triangle@2x.png diff --git a/src/app/valentina/share/resources/toolicon/32x32/along_line.png b/src/app/valentina/share/resources/toolicon/32x32/along_line.png index d1f152e1b..d1614ff07 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/along_line.png and b/src/app/valentina/share/resources/toolicon/32x32/along_line.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/along_line@2x.png b/src/app/valentina/share/resources/toolicon/32x32/along_line@2x.png new file mode 100644 index 000000000..d547270a7 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/along_line@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc.png b/src/app/valentina/share/resources/toolicon/32x32/arc.png index 79c59e008..75640462e 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/arc.png and b/src/app/valentina/share/resources/toolicon/32x32/arc.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc@2x.png b/src/app/valentina/share/resources/toolicon/32x32/arc@2x.png new file mode 100644 index 000000000..787a0888c Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/arc@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc_cut.png b/src/app/valentina/share/resources/toolicon/32x32/arc_cut.png index 47c0204a6..ea50c5344 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/arc_cut.png and b/src/app/valentina/share/resources/toolicon/32x32/arc_cut.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc_cut@2x.png b/src/app/valentina/share/resources/toolicon/32x32/arc_cut@2x.png new file mode 100644 index 000000000..4451ffe1e Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/arc_cut@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis@2x.png b/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis@2x.png new file mode 100644 index 000000000..2f82feb67 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc_with_length@2x.png b/src/app/valentina/share/resources/toolicon/32x32/arc_with_length@2x.png new file mode 100644 index 000000000..0339af5dd Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/arc_with_length@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/bisector.png b/src/app/valentina/share/resources/toolicon/32x32/bisector.png index 92e4310a8..ff122bc3a 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/bisector.png and b/src/app/valentina/share/resources/toolicon/32x32/bisector.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/bisector@2x.png b/src/app/valentina/share/resources/toolicon/32x32/bisector@2x.png new file mode 100644 index 000000000..7a4c050d3 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/bisector@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis@2x.png b/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis@2x.png new file mode 100644 index 000000000..c2a0bd52c Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/height.png b/src/app/valentina/share/resources/toolicon/32x32/height.png index 04d3636a4..f9784081b 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/height.png and b/src/app/valentina/share/resources/toolicon/32x32/height.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/height@2x.png b/src/app/valentina/share/resources/toolicon/32x32/height@2x.png new file mode 100644 index 000000000..0cc299122 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/height@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/intersect.png b/src/app/valentina/share/resources/toolicon/32x32/intersect.png index 5a9876bd2..f180ae266 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/intersect.png and b/src/app/valentina/share/resources/toolicon/32x32/intersect.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/intersect@2x.png b/src/app/valentina/share/resources/toolicon/32x32/intersect@2x.png new file mode 100644 index 000000000..7e35be68a Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/intersect@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/line.png b/src/app/valentina/share/resources/toolicon/32x32/line.png index 66bf54ffd..bd38f7f4d 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/line.png and b/src/app/valentina/share/resources/toolicon/32x32/line.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/line@2x.png b/src/app/valentina/share/resources/toolicon/32x32/line@2x.png new file mode 100644 index 000000000..69af91101 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/line@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/line_intersect_axis@2x.png b/src/app/valentina/share/resources/toolicon/32x32/line_intersect_axis@2x.png new file mode 100644 index 000000000..86c6f8827 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/line_intersect_axis@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/new_detail@2x.png b/src/app/valentina/share/resources/toolicon/32x32/new_detail@2x.png new file mode 100644 index 000000000..a264d316c Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/new_detail@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/normal.png b/src/app/valentina/share/resources/toolicon/32x32/normal.png index e2d68e052..c85f931ab 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/normal.png and b/src/app/valentina/share/resources/toolicon/32x32/normal.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/normal@2x.png b/src/app/valentina/share/resources/toolicon/32x32/normal@2x.png new file mode 100644 index 000000000..ffd804981 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/normal@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent@2x.png new file mode 100644 index 000000000..0a4641a34 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent@2x.png new file mode 100644 index 000000000..b7bdb95f7 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png new file mode 100644 index 000000000..b7dee6267 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png index 306c799e4..d5e90752e 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection@2x.png new file mode 100644 index 000000000..3087129ca Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs@2x.png new file mode 100644 index 000000000..dcd9e77f2 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles@2x.png new file mode 100644 index 000000000..4e4f909f2 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/segment.png b/src/app/valentina/share/resources/toolicon/32x32/segment.png index 382b1a1a5..c8c9a4704 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/segment.png and b/src/app/valentina/share/resources/toolicon/32x32/segment.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/segment@2x.png b/src/app/valentina/share/resources/toolicon/32x32/segment@2x.png new file mode 100644 index 000000000..c442c8aed Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/segment@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/shoulder.png b/src/app/valentina/share/resources/toolicon/32x32/shoulder.png index 68abb7d62..ec24d2cf8 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/shoulder.png and b/src/app/valentina/share/resources/toolicon/32x32/shoulder.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/shoulder@2x.png b/src/app/valentina/share/resources/toolicon/32x32/shoulder@2x.png new file mode 100644 index 000000000..ff24322d6 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/shoulder@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/spline.png b/src/app/valentina/share/resources/toolicon/32x32/spline.png index 03cf1cfc2..00a3c641b 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/spline.png and b/src/app/valentina/share/resources/toolicon/32x32/spline.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/spline@2x.png b/src/app/valentina/share/resources/toolicon/32x32/spline@2x.png new file mode 100644 index 000000000..799782817 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/spline@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath.png index 1e3280365..d5629ed2d 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/splinePath.png and b/src/app/valentina/share/resources/toolicon/32x32/splinePath.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath@2x.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath@2x.png new file mode 100644 index 000000000..f2ada742b Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/splinePath@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point 2.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point 2.png new file mode 100644 index 000000000..f9ed997fa Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point 2.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point copy.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point copy.png new file mode 100644 index 000000000..a1288bf59 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point copy.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png index 7b4cea62e..480b00b68 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png and b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point@2x.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point@2x.png new file mode 100644 index 000000000..1a6f9f23c Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png index 55ac6fae0..f56a01095 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png and b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point@2x.png b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point@2x.png new file mode 100644 index 000000000..4c9edea6a Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/triangle.png b/src/app/valentina/share/resources/toolicon/32x32/triangle.png index ab3e09210..1cc493c71 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/triangle.png and b/src/app/valentina/share/resources/toolicon/32x32/triangle.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/triangle@2x.png b/src/app/valentina/share/resources/toolicon/32x32/triangle@2x.png new file mode 100644 index 000000000..9ecb95a72 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/triangle@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/true_darts@2x.png b/src/app/valentina/share/resources/toolicon/32x32/true_darts@2x.png new file mode 100644 index 000000000..d494515e3 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/true_darts@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/union.png b/src/app/valentina/share/resources/toolicon/32x32/union.png index e18cbb5e3..1d6e67018 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/union.png and b/src/app/valentina/share/resources/toolicon/32x32/union.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/union@2x.png b/src/app/valentina/share/resources/toolicon/32x32/union@2x.png new file mode 100644 index 000000000..51c419453 Binary files /dev/null and b/src/app/valentina/share/resources/toolicon/32x32/union@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/svg/along_line.svg b/src/app/valentina/share/resources/toolicon/svg/along_line.svg new file mode 100644 index 000000000..9be387545 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/along_line.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/arc.svg b/src/app/valentina/share/resources/toolicon/svg/arc.svg new file mode 100644 index 000000000..580b2dd69 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/arc.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/arc_cut.svg b/src/app/valentina/share/resources/toolicon/svg/arc_cut.svg new file mode 100644 index 000000000..58ab5dafb --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/arc_cut.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/bisector.svg b/src/app/valentina/share/resources/toolicon/svg/bisector.svg new file mode 100644 index 000000000..33481dbf1 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/bisector.svg @@ -0,0 +1,89 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/height.svg b/src/app/valentina/share/resources/toolicon/svg/height.svg new file mode 100644 index 000000000..a62ff894e --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/height.svg @@ -0,0 +1,90 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/intersect.svg b/src/app/valentina/share/resources/toolicon/svg/intersect.svg new file mode 100644 index 000000000..3f7aa4fbc --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/intersect.svg @@ -0,0 +1,95 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/line.svg b/src/app/valentina/share/resources/toolicon/svg/line.svg new file mode 100644 index 000000000..0f4e95c40 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/line.svg @@ -0,0 +1,74 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/new_detail.svg b/src/app/valentina/share/resources/toolicon/svg/new_detail.svg new file mode 100644 index 000000000..3df573c61 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/new_detail.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/normal.svg b/src/app/valentina/share/resources/toolicon/svg/normal.svg new file mode 100644 index 000000000..069c0016c --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/normal.svg @@ -0,0 +1,85 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/point_of_intersection.svg b/src/app/valentina/share/resources/toolicon/svg/point_of_intersection.svg new file mode 100644 index 000000000..1c7c7fd8f --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/point_of_intersection.svg @@ -0,0 +1,85 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/segment.svg b/src/app/valentina/share/resources/toolicon/svg/segment.svg new file mode 100644 index 000000000..c98f0cf03 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/segment.svg @@ -0,0 +1,74 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/shoulder.svg b/src/app/valentina/share/resources/toolicon/svg/shoulder.svg new file mode 100644 index 000000000..2cccaddf2 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/shoulder.svg @@ -0,0 +1,96 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/spline.svg b/src/app/valentina/share/resources/toolicon/svg/spline.svg new file mode 100644 index 000000000..fdce27713 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/spline.svg @@ -0,0 +1,74 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/splinePath.svg b/src/app/valentina/share/resources/toolicon/svg/splinePath.svg new file mode 100644 index 000000000..cbee2fcbc --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/splinePath.svg @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/splinePath_cut_point.svg b/src/app/valentina/share/resources/toolicon/svg/splinePath_cut_point.svg new file mode 100644 index 000000000..5e6e225ee --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/splinePath_cut_point.svg @@ -0,0 +1,69 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/spline_cut_point.svg b/src/app/valentina/share/resources/toolicon/svg/spline_cut_point.svg new file mode 100644 index 000000000..edf2a1e30 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/spline_cut_point.svg @@ -0,0 +1,69 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/triangle.svg b/src/app/valentina/share/resources/toolicon/svg/triangle.svg new file mode 100644 index 000000000..07e1a6ea6 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/triangle.svg @@ -0,0 +1,107 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/app/valentina/share/resources/toolicon/svg/union.svg b/src/app/valentina/share/resources/toolicon/svg/union.svg new file mode 100644 index 000000000..425c182b1 --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/union.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc index 5720f89cf..ed0dec1b4 100644 --- a/src/libs/vmisc/share/resources/icon.qrc +++ b/src/libs/vmisc/share/resources/icon.qrc @@ -51,5 +51,9 @@ icon/24x24/right_to_left_arrow.png icon/32x32/clockwise.png icon/32x32/syncM.png + icon/16x16/toolsectionarc@2x.png + icon/16x16/toolsectioncurve@2x.png + icon/16x16/toolsectionline@2x.png + icon/16x16/toolsectionpoint@2x.png diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc@2x.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc@2x.png new file mode 100644 index 000000000..e7db368c7 Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve@2x.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve@2x.png new file mode 100644 index 000000000..c8a8fe4e0 Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionline@2x.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionline@2x.png new file mode 100644 index 000000000..50273ec63 Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionline@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint@2x.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint@2x.png new file mode 100644 index 000000000..fb7b85d44 Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint@2x.png differ diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index 174652609..4fdc30c88 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -69,6 +69,9 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv) #endif // QT_VERSION < QT_VERSION_CHECK(5, 3, 0) + // Enable support for HiDPI bitmap resources + setAttribute(Qt::AA_UseHighDpiPixmaps); + connect(this, &QApplication::aboutToQuit, this, &VAbstractApplication::SyncSettings); }