diff --git a/ChangeLog.txt b/ChangeLog.txt index 4084280d0..f92518aa9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -45,6 +45,7 @@ - [#501] Rename Window->Close Window to Window->Close pattern. - [#515] Seam allowance wrong way. - [#494] Printing is not working. +- [#516] Valentina crashes when use "Point intersect line and axis" instrument. # Version 0.4.4 April 12, 2016 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. diff --git a/dist/application-x-valentina-i-measurements.png b/dist/application-x-valentina-i-measurements.png index 0c11a7a71..9c44fe639 100644 Binary files a/dist/application-x-valentina-i-measurements.png and b/dist/application-x-valentina-i-measurements.png differ diff --git a/dist/application-x-valentina-pattern.png b/dist/application-x-valentina-pattern.png index 414698494..6cbbd7b21 100644 Binary files a/dist/application-x-valentina-pattern.png and b/dist/application-x-valentina-pattern.png differ diff --git a/dist/application-x-valentina-s-measurements.png b/dist/application-x-valentina-s-measurements.png index 2cc002976..4cf9bb47b 100644 Binary files a/dist/application-x-valentina-s-measurements.png and b/dist/application-x-valentina-s-measurements.png differ diff --git a/dist/macx/valentina_bundle_background.png b/dist/macx/valentina_bundle_background.png index c50c20c20..06944e003 100644 Binary files a/dist/macx/valentina_bundle_background.png and b/dist/macx/valentina_bundle_background.png differ diff --git a/dist/tape.png b/dist/tape.png index 2619fe44a..7b4bfdc51 100644 Binary files a/dist/tape.png and b/dist/tape.png differ diff --git a/scripts/fix_png.sh b/scripts/fix_png.sh index 658c3a054..56b62b7b2 100755 --- a/scripts/fix_png.sh +++ b/scripts/fix_png.sh @@ -9,6 +9,7 @@ # -ow will overwrite the input file # -rem allb will remove all ancillary chunks except tRNS and gAMA # -reduce does lossless color-type or bit-depth reduction +# -brute — attempt all optimization methods #In the console output you should see "Removed the sRGB chunk.", and possibly more messages about chunk removals. #You will end up with a smaller, optimized png file. As the command will overwrite the original file, make @@ -19,4 +20,7 @@ # usage: # $ ./fix_png.sh -find .. -type f -iname '*.png' -exec pngcrush -ow -rem allb -reduce {} \; +# IMPORTANT!!! Use version 1.8.1 or higher. + +find .. -type f -iname '*.png' -exec pngcrush -ow -rem allb -brute -reduce {} \; + diff --git a/share/Valentina-Logo_v1.png b/share/Valentina-Logo_v1.png index 165ae7dd1..589421041 100644 Binary files a/share/Valentina-Logo_v1.png and b/share/Valentina-Logo_v1.png differ diff --git a/share/mannequin_512x512_individual_table.png b/share/mannequin_512x512_individual_table.png index f9e910e72..b22ebe5f1 100644 Binary files a/share/mannequin_512x512_individual_table.png and b/share/mannequin_512x512_individual_table.png differ diff --git a/share/mannequin_512x512_standard_table.png b/share/mannequin_512x512_standard_table.png index 7c308edb0..08d0b4594 100644 Binary files a/share/mannequin_512x512_standard_table.png and b/share/mannequin_512x512_standard_table.png differ diff --git a/src/app/tape/share/resources/tapeicon/16x16/info.png b/src/app/tape/share/resources/tapeicon/16x16/info.png index 3fda89c20..6af738824 100644 Binary files a/src/app/tape/share/resources/tapeicon/16x16/info.png and b/src/app/tape/share/resources/tapeicon/16x16/info.png differ diff --git a/src/app/tape/share/resources/tapeicon/16x16/measurement.png b/src/app/tape/share/resources/tapeicon/16x16/measurement.png index 8be07543c..7163d9e4f 100644 Binary files a/src/app/tape/share/resources/tapeicon/16x16/measurement.png and b/src/app/tape/share/resources/tapeicon/16x16/measurement.png differ diff --git a/src/app/tape/share/resources/tapeicon/24x24/mannequin.png b/src/app/tape/share/resources/tapeicon/24x24/mannequin.png index e1d3e554c..e86d72787 100644 Binary files a/src/app/tape/share/resources/tapeicon/24x24/mannequin.png and b/src/app/tape/share/resources/tapeicon/24x24/mannequin.png differ diff --git a/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png b/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png index c47c13513..a80bd48e7 100644 Binary files a/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png and b/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png differ diff --git a/src/app/tape/share/resources/tapeicon/64x64/logo.png b/src/app/tape/share/resources/tapeicon/64x64/logo.png index 2619fe44a..7b4bfdc51 100644 Binary files a/src/app/tape/share/resources/tapeicon/64x64/logo.png and b/src/app/tape/share/resources/tapeicon/64x64/logo.png differ diff --git a/src/app/translations.pri b/src/app/translations.pri index 82335c869..10e52c35f 100755 --- a/src/app/translations.pri +++ b/src/app/translations.pri @@ -61,8 +61,8 @@ for(_translation_name, INSTALL_TRANSLATIONS) { } system(rm -fv $${OUT_PWD}/$$DESTDIR/translations/*.qm) } - QMAKE_CLEAN += $$shell_path($$_translation_name) } + QMAKE_CLEAN += $$shell_path($$_translation_name) } # Make possible run program even you do not install it. Seek files in local directory. diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index cc5b835b6..03b76c2a2 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -124,7 +124,8 @@ MainWindow::MainWindow(QWidget *parent) toolOptions(nullptr), groupsWidget(nullptr), detailsWidget(nullptr), - lock(nullptr) + lock(nullptr), + toolButtonPointerList() { for (int i = 0; i < MaxRecentFiles; ++i) { @@ -1736,6 +1737,18 @@ void MainWindow::ToolBarTools() //--------------------------------------------------------------------------------------------------------------------- void MainWindow::InitToolButtons() { + toolButtonPointerList.append(ui->toolButtonPointerPoint); + toolButtonPointerList.append(ui->toolButtonPointerLine); + toolButtonPointerList.append(ui->toolButtonPointerCurve); + toolButtonPointerList.append(ui->toolButtonPointerArc); + toolButtonPointerList.append(ui->toolButtonPointerDetail); + toolButtonPointerList.append(ui->toolButtonPointerOperations); + + for (auto pointer : toolButtonPointerList) + { + connect(pointer, &QToolButton::clicked, this, &MainWindow::ArrowTool); + } + connect(ui->toolButtonEndLine, &QToolButton::clicked, this, &MainWindow::ToolEndLine); connect(ui->toolButtonLine, &QToolButton::clicked, this, &MainWindow::ToolLine); connect(ui->toolButtonAlongLine, &QToolButton::clicked, this, &MainWindow::ToolAlongLine); @@ -1827,7 +1840,10 @@ void MainWindow::CancelTool() switch ( currentTool ) { case Tool::Arrow: - ui->actionArrowTool->setChecked(false); + for (auto pointer : toolButtonPointerList) + { + pointer->setChecked(false); + } helpLabel->setText(""); ui->actionStopTool->setEnabled(true); @@ -1974,7 +1990,10 @@ void MainWindow::ArrowTool() { qCDebug(vMainWindow, "Arrow tool."); CancelTool(); - ui->actionArrowTool->setChecked(true); + for (auto pointer : toolButtonPointerList) + { + pointer->setChecked(true); + } ui->actionStopTool->setEnabled(false); currentTool = Tool::Arrow; emit EnableItemMove(true); @@ -3161,6 +3180,12 @@ void MainWindow::SetEnableTool(bool enable) ui->actionLast_tool->setEnabled(drawTools); + for (auto pointer : toolButtonPointerList) + { + pointer->setEnabled(drawTools || modelingTools); + pointer->setChecked(drawTools || modelingTools); + } + //Modeling Tools ui->toolButtonUnionDetails->setEnabled(modelingTools); @@ -3444,7 +3469,10 @@ void MainWindow::LastUsedTool() switch ( lastUsedTool ) { case Tool::Arrow: - ui->actionArrowTool->setChecked(true); + for (auto pointer : toolButtonPointerList) + { + pointer->setChecked(true); + } ArrowTool(); break; case Tool::BasePoint: @@ -3985,7 +4013,6 @@ void MainWindow::WindowsLocale() //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolBarStyles() { - ToolBarStyle(ui->toolBarArrows); ToolBarStyle(ui->toolBarDraws); ToolBarStyle(ui->toolBarOption); ToolBarStyle(ui->toolBarStages); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 1f8b5cd91..88d59c8de 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -50,6 +50,7 @@ class DialogTool; class DialogHistory; class VWidgetGroups; class VWidgetDetails; +class QToolButton; /** * @brief The MainWindow class main windows. @@ -280,6 +281,8 @@ private: VWidgetDetails *detailsWidget; std::shared_ptr> lock; + QList toolButtonPointerList; + void SetDefaultHeight(); void SetDefaultSize(); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index d1e500848..0bad623ad 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -48,15 +48,15 @@ Tools - 0 + 4 0 0 - 130 - 318 + 117 + 358 @@ -82,32 +82,6 @@ QFormLayout::AllNonFixedFieldsGrow - - - - false - - - Point at distance and angle - - - ... - - - - :/toolicon/32x32/segment.png:/toolicon/32x32/segment.png - - - - 32 - 32 - - - - true - - - @@ -368,6 +342,32 @@ + + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + @@ -394,6 +394,32 @@ + + + + false + + + Point at distance and angle + + + ... + + + + :/toolicon/32x32/segment.png:/toolicon/32x32/segment.png + + + + 32 + 32 + + + + true + + + @@ -402,7 +428,7 @@ 0 0 130 - 58 + 110 @@ -425,10 +451,33 @@ Line - - QFormLayout::AllNonFixedFieldsGrow - + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + + false @@ -454,7 +503,7 @@ - + false @@ -488,7 +537,7 @@ 0 0 130 - 196 + 248 @@ -511,36 +560,7 @@ Curve - - QFormLayout::AllNonFixedFieldsGrow - - - - - false - - - Simple curve - - - ... - - - - :/toolicon/32x32/spline.png:/toolicon/32x32/spline.png - - - - 32 - 32 - - - - true - - - - + false @@ -566,7 +586,7 @@ - + false @@ -592,7 +612,7 @@ - + false @@ -618,7 +638,7 @@ - + false @@ -644,7 +664,30 @@ - + + + + false + + + ... + + + + :/toolicon/32x32/cubic_bezier_path.png:/toolicon/32x32/cubic_bezier_path.png + + + + 32 + 32 + + + + true + + + + false @@ -670,7 +713,7 @@ - + false @@ -696,17 +739,46 @@ - - + + false + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Simple curve + ... - :/toolicon/32x32/cubic_bezier_path.png:/toolicon/32x32/cubic_bezier_path.png + :/toolicon/32x32/spline.png:/toolicon/32x32/spline.png @@ -727,7 +799,7 @@ 0 0 130 - 196 + 248 @@ -750,10 +822,7 @@ Arc - - QFormLayout::AllNonFixedFieldsGrow - - + false @@ -779,7 +848,7 @@ - + false @@ -805,7 +874,7 @@ - + false @@ -831,7 +900,7 @@ - + false @@ -857,7 +926,7 @@ - + false @@ -883,7 +952,7 @@ - + false @@ -909,7 +978,7 @@ - + false @@ -935,7 +1004,7 @@ - + false @@ -961,6 +1030,32 @@ + + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + @@ -984,6 +1079,32 @@ + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + + false @@ -1009,7 +1130,7 @@ - + false @@ -1043,7 +1164,7 @@ 0 0 130 - 58 + 104 @@ -1066,10 +1187,33 @@ Detail - - QFormLayout::AllNonFixedFieldsGrow - + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + + false @@ -1095,7 +1239,7 @@ - + false @@ -1433,26 +1577,6 @@ - - - - 10 - - - - Toolbar pointer - - - Qt::ToolButtonTextUnderIcon - - - TopToolBarArea - - - false - - - QDockWidget::NoDockWidgetFeatures diff --git a/src/app/valentina/share/resources/cursor/alongline_cursor.png b/src/app/valentina/share/resources/cursor/alongline_cursor.png index 5a8fa3106..ce4abce8d 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 index 6d83e86ca..5fa83c01d 100644 Binary files a/src/app/valentina/share/resources/cursor/alongline_cursor@2x.png 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 9f830dc16..2e33d6a89 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 index bf3fe6b8c..ec301e855 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_cursor@2x.png 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 327a86b5e..ed290dc88 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 index 00c95e151..623e5b5fd 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_cut_cursor@2x.png 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 128cf2fad..baab9e73e 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 index 60bf91cc6..5d495d47a 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor@2x.png 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 69d504c6a..9293cc178 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 index 3cbf1ef54..3de9c62f4 100644 Binary files a/src/app/valentina/share/resources/cursor/arc_with_length_cursor@2x.png 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 a75426631..3d3f56bf6 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/cubic_bezier_cursor.png b/src/app/valentina/share/resources/cursor/cubic_bezier_cursor.png index 43846d106..94292df06 100644 Binary files a/src/app/valentina/share/resources/cursor/cubic_bezier_cursor.png and b/src/app/valentina/share/resources/cursor/cubic_bezier_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/cubic_bezier_cursor@2x.png b/src/app/valentina/share/resources/cursor/cubic_bezier_cursor@2x.png index 8b549a635..b7358a276 100644 Binary files a/src/app/valentina/share/resources/cursor/cubic_bezier_cursor@2x.png and b/src/app/valentina/share/resources/cursor/cubic_bezier_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/cubic_bezier_path_cursor.png b/src/app/valentina/share/resources/cursor/cubic_bezier_path_cursor.png index 9016a52bf..66284eff5 100644 Binary files a/src/app/valentina/share/resources/cursor/cubic_bezier_path_cursor.png and b/src/app/valentina/share/resources/cursor/cubic_bezier_path_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png b/src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png index d81688642..e6ff13a0f 100644 Binary files a/src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png and b/src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png differ diff --git a/src/app/valentina/share/resources/cursor/cursor-arrow-openhand.png b/src/app/valentina/share/resources/cursor/cursor-arrow-openhand.png index bdde627f6..a942998ce 100644 Binary files a/src/app/valentina/share/resources/cursor/cursor-arrow-openhand.png and b/src/app/valentina/share/resources/cursor/cursor-arrow-openhand.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 9538e89e8..ed3b8c220 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 index a173a6df5..4ce4531ff 100644 Binary files a/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor@2x.png 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 d914b9dc3..2e910e4d3 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 index 0c94f83f5..b4d92fcf1 100644 Binary files a/src/app/valentina/share/resources/cursor/endline_cursor@2x.png and b/src/app/valentina/share/resources/cursor/endline_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/group_plus_cursor.png b/src/app/valentina/share/resources/cursor/group_plus_cursor.png index bcac91a6b..e4ba7629b 100644 Binary files a/src/app/valentina/share/resources/cursor/group_plus_cursor.png and b/src/app/valentina/share/resources/cursor/group_plus_cursor.png differ diff --git a/src/app/valentina/share/resources/cursor/group_plus_cursor@2x.png b/src/app/valentina/share/resources/cursor/group_plus_cursor@2x.png index 8f03d6686..9e070e0d4 100644 Binary files a/src/app/valentina/share/resources/cursor/group_plus_cursor@2x.png and b/src/app/valentina/share/resources/cursor/group_plus_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 4d4546de9..5cdf68440 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 index c1321e75e..6d3d9b181 100644 Binary files a/src/app/valentina/share/resources/cursor/height_cursor@2x.png 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 8955a89d4..56d61c25b 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 index 36427ba76..87a2ea7bf 100644 Binary files a/src/app/valentina/share/resources/cursor/intersect_cursor@2x.png and b/src/app/valentina/share/resources/cursor/intersect_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/intersection_curves_cursor.png b/src/app/valentina/share/resources/cursor/intersection_curves_cursor.png index 54a5c7cae..f90b20e94 100644 Binary files a/src/app/valentina/share/resources/cursor/intersection_curves_cursor.png and b/src/app/valentina/share/resources/cursor/intersection_curves_cursor.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 fa2f937f7..c04208fd9 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 index a4f0111ea..75ab5c2cb 100644 Binary files a/src/app/valentina/share/resources/cursor/line_cursor@2x.png 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 a8014d4de..30fb82ada 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 index 195d65335..4b82a3a3c 100644 Binary files a/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor@2x.png and b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/midpoint_cursor.png b/src/app/valentina/share/resources/cursor/midpoint_cursor.png index 1c4b026bf..729a0d3ca 100644 Binary files a/src/app/valentina/share/resources/cursor/midpoint_cursor.png and b/src/app/valentina/share/resources/cursor/midpoint_cursor.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 ad72c1441..ff2027e87 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/normal_cursor.png b/src/app/valentina/share/resources/cursor/normal_cursor.png index f9227e387..404039256 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 index eff2aa2f4..9867628b8 100644 Binary files a/src/app/valentina/share/resources/cursor/normal_cursor@2x.png 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 4bd286cc1..1831b24f7 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_circle_and_tangent_cursor.png b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png index 721416f6a..c100152bf 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_of_intersection_arcs.png b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png index b29d48304..62b1c64f1 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_circles.png b/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png index d56322643..1793de12c 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/pointcontact_cursor.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png index 6f360942d..7655a045f 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 index f96d14457..a77475755 100644 Binary files a/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png 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 097b12dd2..aebf00ce5 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/rotation_cursor@2x.png b/src/app/valentina/share/resources/cursor/rotation_cursor@2x.png index 89a988ce9..8e991dc7c 100644 Binary files a/src/app/valentina/share/resources/cursor/rotation_cursor@2x.png and b/src/app/valentina/share/resources/cursor/rotation_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 e49af9eba..e5319cd8b 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 index bcdc5c158..d3df79ffc 100644 Binary files a/src/app/valentina/share/resources/cursor/shoulder_cursor@2x.png 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 0a794094d..b9e94d3ae 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 index 7c2826038..af6a8e7b7 100644 Binary files a/src/app/valentina/share/resources/cursor/spline_cursor@2x.png 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 6db77d804..914156410 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/splinepath_cursor.png b/src/app/valentina/share/resources/cursor/splinepath_cursor.png index 782a05579..f97dad609 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 index e5f74bb13..a6a6e4c44 100644 Binary files a/src/app/valentina/share/resources/cursor/splinepath_cursor@2x.png 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 eb8ccb81a..33b4aca96 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 index 87d2945db..5ca5085db 100644 Binary files a/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor@2x.png and b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor@2x.png differ diff --git a/src/app/valentina/share/resources/cursor/triangle_cursor.png b/src/app/valentina/share/resources/cursor/triangle_cursor.png index 87d696a25..8716da826 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 index 291be8b6a..3616701b2 100644 Binary files a/src/app/valentina/share/resources/cursor/triangle_cursor@2x.png and b/src/app/valentina/share/resources/cursor/triangle_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 3eb72de5a..a9e75019b 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 index c43af09af..5689a1209 100644 Binary files a/src/app/valentina/share/resources/cursor/union_cursor@2x.png and b/src/app/valentina/share/resources/cursor/union_cursor@2x.png differ 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 9025ced52..d9896995f 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 index ba19debdc..a041c49fb 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/along_line@2x.png 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 d556705ea..2d94144a2 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 index 50a920c15..c628c90c1 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/arc@2x.png 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 012c7c9fc..db4bf857f 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_intersect_axis.png b/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis.png index 991125c75..1a0d15cb2 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis.png and b/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/arc_with_length.png b/src/app/valentina/share/resources/toolicon/32x32/arc_with_length.png index 8f97f06e2..77e4e71af 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/arc_with_length.png and b/src/app/valentina/share/resources/toolicon/32x32/arc_with_length.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 6c729c002..d898830a9 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/cubic_bezier@2x.png b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier@2x.png index e64a2c8fd..b93e4bbf5 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path.png b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path.png index 4dbee72f9..676dd3c94 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path.png and b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path@2x.png b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path@2x.png index 04f76599e..c37e2a417 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/cubic_bezier_path@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.png b/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.png index 813394562..c2df3aa5e 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.png and b/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.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 index b991efec4..6e0093f3d 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis@2x.png 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/group_plus.png b/src/app/valentina/share/resources/toolicon/32x32/group_plus.png index bcd3ceb80..88338c67e 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/group_plus.png 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 index acf75a8f5..22cbf88c6 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/group_plus@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 18a750895..d62c82e7f 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/intersect.png b/src/app/valentina/share/resources/toolicon/32x32/intersect.png index 1302656cb..4bd24d27f 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/intersection_curves.png b/src/app/valentina/share/resources/toolicon/32x32/intersection_curves.png index dc8e2a1c9..fcc5ad4d0 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/intersection_curves.png and b/src/app/valentina/share/resources/toolicon/32x32/intersection_curves.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 55f10f04b..1d92bbd81 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 index c3b3f1ccb..78b504b38 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/line@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/line@2x.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/midpoint.png b/src/app/valentina/share/resources/toolicon/32x32/midpoint.png index df8f840b5..f87a72c94 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/midpoint.png and b/src/app/valentina/share/resources/toolicon/32x32/midpoint.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/midpoint@2x.png b/src/app/valentina/share/resources/toolicon/32x32/midpoint@2x.png index 4055660f6..a3fdb5e48 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/midpoint@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/midpoint@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 index 520cdd115..5727bd04f 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/new_detail@2x.png 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 07ee6afaa..28e5e4362 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/point_from_arc_and_tangent.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent.png index 25c1d7aff..2bb60a807 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent.png and b/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.png index 272455da0..38bf4dea7 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.png and b/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.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 index cb1bf9336..e92cb8687 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent@2x.png 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.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png index 6215ac18a..d6943bfda 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png index d7868356c..9c2ddff16 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png index 062a23da7..d77aea663 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png differ diff --git a/src/app/valentina/share/resources/toolicon/32x32/rotation@2x.png b/src/app/valentina/share/resources/toolicon/32x32/rotation@2x.png index 79f1aad66..3020d23ba 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/rotation@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/rotation@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 8e867478e..db8303857 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 index bc2d22b93..11c0fab52 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/segment@2x.png 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 c4a7226a7..5f46b423b 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/spline@2x.png b/src/app/valentina/share/resources/toolicon/32x32/spline@2x.png index 4b4bf6adb..cec825355 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/spline@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/spline@2x.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 index 60b42f467..c138eeeb9 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/splinePath@2x.png 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.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png index e0d034ec7..f3c347223 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/spline_cut_point.png b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png index 4ced757a4..39da39a23 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/triangle.png b/src/app/valentina/share/resources/toolicon/32x32/triangle.png index b763e3fb8..84ada50f7 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/true_darts@2x.png b/src/app/valentina/share/resources/toolicon/32x32/true_darts@2x.png index cfa91db49..ed858a5ff 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/true_darts@2x.png 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 3eb72de5a..2888ec461 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 index c43af09af..1ae2a06cd 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/union@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/union@2x.png differ diff --git a/src/libs/vlayout/share/scissors_horizontal.png b/src/libs/vlayout/share/scissors_horizontal.png index 310a5ba0b..5c10bf22c 100644 Binary files a/src/libs/vlayout/share/scissors_horizontal.png and b/src/libs/vlayout/share/scissors_horizontal.png differ diff --git a/src/libs/vlayout/share/scissors_vertical.png b/src/libs/vlayout/share/scissors_vertical.png index 99a4a0a86..5c0f0d0b2 100644 Binary files a/src/libs/vlayout/share/scissors_vertical.png and b/src/libs/vlayout/share/scissors_vertical.png differ diff --git a/src/libs/vmisc/share/resources/flags/Brazil.png b/src/libs/vmisc/share/resources/flags/Brazil.png index e660338c4..8ae7d8ebc 100644 Binary files a/src/libs/vmisc/share/resources/flags/Brazil.png and b/src/libs/vmisc/share/resources/flags/Brazil.png differ diff --git a/src/libs/vmisc/share/resources/flags/China.png b/src/libs/vmisc/share/resources/flags/China.png index 08fca13d5..643000127 100644 Binary files a/src/libs/vmisc/share/resources/flags/China.png and b/src/libs/vmisc/share/resources/flags/China.png differ diff --git a/src/libs/vmisc/share/resources/flags/CzechRepublic.png b/src/libs/vmisc/share/resources/flags/CzechRepublic.png index e0e79e5a9..2019bc621 100644 Binary files a/src/libs/vmisc/share/resources/flags/CzechRepublic.png and b/src/libs/vmisc/share/resources/flags/CzechRepublic.png differ diff --git a/src/libs/vmisc/share/resources/flags/Germany.png b/src/libs/vmisc/share/resources/flags/Germany.png index f20f22b56..858365329 100644 Binary files a/src/libs/vmisc/share/resources/flags/Germany.png and b/src/libs/vmisc/share/resources/flags/Germany.png differ diff --git a/src/libs/vmisc/share/resources/flags/Israel.png b/src/libs/vmisc/share/resources/flags/Israel.png index 531d716ea..e5d2f3aa9 100644 Binary files a/src/libs/vmisc/share/resources/flags/Israel.png and b/src/libs/vmisc/share/resources/flags/Israel.png differ diff --git a/src/libs/vmisc/share/resources/flags/Italy.png b/src/libs/vmisc/share/resources/flags/Italy.png index 3dbca2b17..f48930af1 100644 Binary files a/src/libs/vmisc/share/resources/flags/Italy.png and b/src/libs/vmisc/share/resources/flags/Italy.png differ diff --git a/src/libs/vmisc/share/resources/flags/Netherlands.png b/src/libs/vmisc/share/resources/flags/Netherlands.png index acb338224..abf09bebe 100644 Binary files a/src/libs/vmisc/share/resources/flags/Netherlands.png and b/src/libs/vmisc/share/resources/flags/Netherlands.png differ diff --git a/src/libs/vmisc/share/resources/flags/Romania.png b/src/libs/vmisc/share/resources/flags/Romania.png index e7fa4f5c9..79a35dd2d 100644 Binary files a/src/libs/vmisc/share/resources/flags/Romania.png and b/src/libs/vmisc/share/resources/flags/Romania.png differ diff --git a/src/libs/vmisc/share/resources/flags/Russia.png b/src/libs/vmisc/share/resources/flags/Russia.png index 2076f9ae0..024f07c2b 100644 Binary files a/src/libs/vmisc/share/resources/flags/Russia.png and b/src/libs/vmisc/share/resources/flags/Russia.png differ diff --git a/src/libs/vmisc/share/resources/flags/Ukraine.png b/src/libs/vmisc/share/resources/flags/Ukraine.png index 8c13d9e66..6d1fc9d76 100644 Binary files a/src/libs/vmisc/share/resources/flags/Ukraine.png and b/src/libs/vmisc/share/resources/flags/Ukraine.png differ diff --git a/src/libs/vmisc/share/resources/flags/UnitedStates.png b/src/libs/vmisc/share/resources/flags/UnitedStates.png index 6d648c149..c8e38a1b0 100644 Binary files a/src/libs/vmisc/share/resources/flags/UnitedStates.png and b/src/libs/vmisc/share/resources/flags/UnitedStates.png differ diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc index 74cb170cd..49eb8ac59 100644 --- a/src/libs/vmisc/share/resources/icon.qrc +++ b/src/libs/vmisc/share/resources/icon.qrc @@ -4,6 +4,7 @@ icon/32x32/draw.png icon/32x32/kontur.png icon/32x32/arrow_cursor.png + icon/32x32/arrow_cursor@2x.png icon/32x32/new_draw.png icon/32x32/option_draw.png icon/32x32/table.png diff --git a/src/libs/vmisc/share/resources/icon/16x16/allow_detail@2x.png b/src/libs/vmisc/share/resources/icon/16x16/allow_detail@2x.png index b4c1518ce..d4c3f64fb 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/allow_detail@2x.png and b/src/libs/vmisc/share/resources/icon/16x16/allow_detail@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/closed_eye.png b/src/libs/vmisc/share/resources/icon/16x16/closed_eye.png index 28a28804e..918d90e9d 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/closed_eye.png and b/src/libs/vmisc/share/resources/icon/16x16/closed_eye.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/closed_eye@2x.png b/src/libs/vmisc/share/resources/icon/16x16/closed_eye@2x.png index 3eb72de5a..ed3d73c0e 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/closed_eye@2x.png and b/src/libs/vmisc/share/resources/icon/16x16/closed_eye@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/fx.png b/src/libs/vmisc/share/resources/icon/16x16/fx.png index f3f6083c4..10b80ef00 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/fx.png and b/src/libs/vmisc/share/resources/icon/16x16/fx.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/info.png b/src/libs/vmisc/share/resources/icon/16x16/info.png index a2d03fd75..d8a62e7df 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/info.png and b/src/libs/vmisc/share/resources/icon/16x16/info.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/landscape.png b/src/libs/vmisc/share/resources/icon/16x16/landscape.png index d9ed4af8f..63ef010f7 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/landscape.png and b/src/libs/vmisc/share/resources/icon/16x16/landscape.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/measurement.png b/src/libs/vmisc/share/resources/icon/16x16/measurement.png index 2b931fe10..fc2119655 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/measurement.png and b/src/libs/vmisc/share/resources/icon/16x16/measurement.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/mirror.png b/src/libs/vmisc/share/resources/icon/16x16/mirror.png index 94e3682b0..3b49b74a6 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/mirror.png and b/src/libs/vmisc/share/resources/icon/16x16/mirror.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/open_eye.png b/src/libs/vmisc/share/resources/icon/16x16/open_eye.png index 138e71b13..3a86b505c 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/open_eye.png and b/src/libs/vmisc/share/resources/icon/16x16/open_eye.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/open_eye@2x.png b/src/libs/vmisc/share/resources/icon/16x16/open_eye@2x.png index 7f7c0cc96..c636eaa58 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/open_eye@2x.png and b/src/libs/vmisc/share/resources/icon/16x16/open_eye@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/portrait.png b/src/libs/vmisc/share/resources/icon/16x16/portrait.png index 739c386ac..3ef0c99ad 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/portrait.png and b/src/libs/vmisc/share/resources/icon/16x16/portrait.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/roll.png b/src/libs/vmisc/share/resources/icon/16x16/roll.png index 282194b1b..49c30dff1 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/roll.png and b/src/libs/vmisc/share/resources/icon/16x16/roll.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/template.png b/src/libs/vmisc/share/resources/icon/16x16/template.png index 45bfc017c..c29755d29 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/template.png and b/src/libs/vmisc/share/resources/icon/16x16/template.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png index 7f9ffae00..73f8d2514 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png index 289cba811..39f2d2a9e 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png index 9c1efe83e..7c83df3c7 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.png index 9a4b16c3c..2a587cab0 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.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 index 3eb72de5a..49272dae4 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectionline@2x.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionline@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.png index f1be3e082..bc55d82dd 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.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 index 3eb72de5a..2dbb17d7d 100644 Binary files a/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint@2x.png and b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/24x24/equal.png b/src/libs/vmisc/share/resources/icon/24x24/equal.png index 6bbc8db07..44ffe8df5 100644 Binary files a/src/libs/vmisc/share/resources/icon/24x24/equal.png and b/src/libs/vmisc/share/resources/icon/24x24/equal.png differ diff --git a/src/libs/vmisc/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png b/src/libs/vmisc/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png index 3e335c285..1d767796f 100644 Binary files a/src/libs/vmisc/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png and b/src/libs/vmisc/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png differ diff --git a/src/libs/vmisc/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png b/src/libs/vmisc/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png index cce2b45be..e113a5957 100644 Binary files a/src/libs/vmisc/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png and b/src/libs/vmisc/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png differ diff --git a/src/libs/vmisc/share/resources/icon/24x24/fx.png b/src/libs/vmisc/share/resources/icon/24x24/fx.png index 953bd36d5..6cc6192cc 100644 Binary files a/src/libs/vmisc/share/resources/icon/24x24/fx.png and b/src/libs/vmisc/share/resources/icon/24x24/fx.png differ diff --git a/src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png b/src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png index 13f98523d..7d3ea0046 100644 Binary files a/src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png and b/src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png index dd58159c1..bbcc096cc 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png index 7686e15a5..e98ce199b 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png index 3ee3d66e9..6cc5724c3 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowRight.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRight.png index 9301243d9..da578826e 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowRight.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowRight.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png index ef194ab8f..3f1d45c7e 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png index e5420214a..401932650 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png and b/src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png b/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png index e440ef784..823837f4e 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png and b/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor@2x.png b/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor@2x.png new file mode 100644 index 000000000..2f9ddb804 Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor@2x.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/draw.png b/src/libs/vmisc/share/resources/icon/32x32/draw.png index 85e4703cd..d20e06b23 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/draw.png and b/src/libs/vmisc/share/resources/icon/32x32/draw.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png b/src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png index 9083c8344..d5dd3f216 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png and b/src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png differ diff --git a/src/libs/vmisc/share/resources/icon/32x32/kontur.png b/src/libs/vmisc/share/resources/icon/32x32/kontur.png index 121496356..b430e259b 100644 Binary files a/src/libs/vmisc/share/resources/icon/32x32/kontur.png and b/src/libs/vmisc/share/resources/icon/32x32/kontur.png differ diff --git a/src/libs/vmisc/share/resources/icon/community_config.png b/src/libs/vmisc/share/resources/icon/community_config.png index 5e5f6bebe..77af431a6 100644 Binary files a/src/libs/vmisc/share/resources/icon/community_config.png and b/src/libs/vmisc/share/resources/icon/community_config.png differ diff --git a/src/libs/vmisc/share/resources/icon/config.png b/src/libs/vmisc/share/resources/icon/config.png index 7aabddb36..36fcb6d61 100644 Binary files a/src/libs/vmisc/share/resources/icon/config.png and b/src/libs/vmisc/share/resources/icon/config.png differ diff --git a/src/libs/vmisc/share/resources/icon/pattern_config.png b/src/libs/vmisc/share/resources/icon/pattern_config.png index d62861b1f..320228bb4 100644 Binary files a/src/libs/vmisc/share/resources/icon/pattern_config.png and b/src/libs/vmisc/share/resources/icon/pattern_config.png differ diff --git a/src/libs/vmisc/share/resources/icon/svg/arrow_cursor.svg b/src/libs/vmisc/share/resources/icon/svg/arrow_cursor.svg new file mode 100644 index 000000000..48b83cb61 --- /dev/null +++ b/src/libs/vmisc/share/resources/icon/svg/arrow_cursor.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png index fafb8fef6..572afddcf 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-new.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-new.png index 800d1bac2..e4fcc793d 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-new.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-new.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-open.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-open.png index 5b13e87ad..e203b5bf0 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-open.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-open.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png index c762244d6..5fec5dda5 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print.png index 3f741c27e..bfb18ce54 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-print.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png index ce137edc0..89c9369de 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save.png index ce137edc0..89c9369de 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/document-save.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png index 2314bfa3e..d82e3b569 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png index a7d0c3838..bdfc90481 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-bottom.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-bottom.png index c27500ad8..6be61f6d0 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-bottom.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-bottom.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png index c0d88251c..941423cc5 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-next.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-next.png index 7e0551757..1a0589174 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-next.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-next.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-previous.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-previous.png index 9f0731d9e..765757967 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-previous.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-previous.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png index ffc874aab..f088fd88c 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png index 20a33778c..d50b293da 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-add.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-add.png index 9d7f54db6..6fcd7b185 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-add.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-add.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png index 3c8bef186..901f5c164 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png index a7d0c3838..bdfc90481 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png index 54df9f5cc..573baa0dd 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png index 167508db9..bd85d8109 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png index d19fc2f5f..1a7658fff 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png index 073b6f4a7..8fcea8cce 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png index 1b4d1d3bd..20741708e 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png index 7883f8f92..c8008fb06 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/status/dialog-warning.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/status/dialog-warning.png index 54566d5d5..b020ee34b 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/status/dialog-warning.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/status/dialog-warning.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png index 697abf6b9..76a760b34 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png index 481081ff1..3a02624a4 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-save.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-save.png index e9f6cc338..39931fba0 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-save.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/document-save.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png index 1a7405365..c67d2b98c 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-bottom.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-bottom.png index e70db7b94..59534d1e6 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-bottom.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-bottom.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/help-about.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/help-about.png index 9e7170860..deaef012e 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/help-about.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/help-about.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png index 583551d0d..5e3af989b 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png index f69c1a5c2..8ced2d1c1 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png index ca0a7ad4a..06229e4e5 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png index 92b9135da..b58cbc50d 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png index 92fd8a4f7..751812269 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-bottom.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-bottom.png index bc07666cc..48a205da6 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-bottom.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-bottom.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-down.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-down.png index 2beb04a54..ca67d0279 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-down.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-down.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-next.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-next.png index fcf1dc004..00a7e50fc 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-next.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-next.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-previous.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-previous.png index 1f4f83060..36c0903d5 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-previous.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-previous.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-top.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-top.png index 6b2fd458c..f13c42986 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-top.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-top.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png index 015f0cd16..268668481 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png index 68e0445d8..1c58a7b06 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png index 6464d9f19..1a30e70dc 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png index be5670bd9..4a25bf96d 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png index 42dea5efe..3d3fba186 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png index 24da2b17f..62c989929 100644 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png differ diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 802e3bc92..bb161497c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -157,7 +157,15 @@ QPointF VToolLineIntersectAxis::FindPoint(const QLineF &axis, const QLineF &line QLineF::IntersectType intersect = axis.intersect(line, &fPoint); if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { - return fPoint; + if(VFuzzyComparePossibleNulls(axis.angle(), line.angle()) + || VFuzzyComparePossibleNulls(qAbs(axis.angle() - line.angle()), 180)) + { + return QPointF(); + } + else + { + return fPoint; + } } else { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index c3485d5c1..49899608c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -182,6 +182,11 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c { return QPointF(); } + if (VFuzzyComparePossibleNulls(axis.angle(), hypotenuse.angle()) + || VFuzzyComparePossibleNulls(qAbs(axis.angle() - hypotenuse.angle()), 180)) + { + return QPointF(); + } qreal step = 1; diff --git a/src/test/ValentinaTest/tst_findpoint.cpp b/src/test/ValentinaTest/tst_findpoint.cpp index f29a6388a..43acd44bf 100644 --- a/src/test/ValentinaTest/tst_findpoint.cpp +++ b/src/test/ValentinaTest/tst_findpoint.cpp @@ -29,6 +29,8 @@ #include "tst_findpoint.h" #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h" #include "../vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h" +#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h" +#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h" #include @@ -208,3 +210,59 @@ void TST_FindPoint::TestTrueDarts() QCOMPARE(p1.toPoint(), expectP1.toPoint()); QCOMPARE(p2.toPoint(), expectP2.toPoint()); } + +//--------------------------------------------------------------------------------------------------------------------- +void TST_FindPoint::TestLineIntersectAxis_data() +{ + QTest::addColumn("axis"); + QTest::addColumn("line"); + QTest::addColumn("point"); + + const QLineF axis(0, 0, 1, 0); + const QLineF line(0, 1, 1, 1); + const QPointF point(0, 0); + + QTest::newRow("Parallel lines") << axis << line << point; +} + +//--------------------------------------------------------------------------------------------------------------------- +void TST_FindPoint::TestLineIntersectAxis() +{ + QFETCH(QLineF, axis); + QFETCH(QLineF, line); + QFETCH(QPointF, point); + + QPointF resultPoint = VToolLineIntersectAxis::FindPoint(axis, line); + QCOMPARE(point, resultPoint); +} + +//--------------------------------------------------------------------------------------------------------------------- +void TST_FindPoint::TestTriangle_data() +{ + QTest::addColumn("axisP1"); + QTest::addColumn("axisP2"); + QTest::addColumn("firstPoint"); + QTest::addColumn("secondPoint"); + QTest::addColumn("point"); + + const QPointF axisP1(0, 0); + const QPointF axisP2(0, 1); + const QPointF firstPoint(1, 0); + const QPointF secondPoint(1, 1); + const QPointF point(0, 0); + + QTest::newRow("Parallel lines") << axisP1 << axisP2 << firstPoint << secondPoint << point; +} + +//--------------------------------------------------------------------------------------------------------------------- +void TST_FindPoint::TestTriangle() +{ + QFETCH(QPointF, axisP1); + QFETCH(QPointF, axisP2); + QFETCH(QPointF, firstPoint); + QFETCH(QPointF, secondPoint); + QFETCH(QPointF, point); + + QPointF resultPoint = VToolTriangle::FindPoint(axisP1, axisP2, firstPoint, secondPoint); + QCOMPARE(point, resultPoint); +} diff --git a/src/test/ValentinaTest/tst_findpoint.h b/src/test/ValentinaTest/tst_findpoint.h index e8ff331e9..694deb3a4 100644 --- a/src/test/ValentinaTest/tst_findpoint.h +++ b/src/test/ValentinaTest/tst_findpoint.h @@ -44,6 +44,12 @@ private slots: void TestTrueDarts_data(); void TestTrueDarts(); + void TestLineIntersectAxis_data(); + void TestLineIntersectAxis(); + + void TestTriangle_data(); + void TestTriangle(); + }; #endif // TST_FINDPOINT_H