diff --git a/src/app/tape/main.cpp b/src/app/tape/main.cpp
index 8de1086c3..8ff30dd66 100644
--- a/src/app/tape/main.cpp
+++ b/src/app/tape/main.cpp
@@ -35,6 +35,7 @@ int main(int argc, char *argv[])
{
Q_INIT_RESOURCE(tapeicon);
Q_INIT_RESOURCE(theme);
+ Q_INIT_RESOURCE(icon);
QT_REQUIRE_VERSION(argc, argv, "5.0.0");
diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui
index 58e3b2b3a..2869e7103 100644
--- a/src/app/valentina/mainwindow.ui
+++ b/src/app/valentina/mainwindow.ui
@@ -14,7 +14,7 @@
Valentina
-
+
:/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png
@@ -69,7 +69,7 @@
Tools for creating points.
-
+
:/icon/16x16/toolsectionpoint.png:/icon/16x16/toolsectionpoint.png
@@ -351,7 +351,7 @@
...
-
+
:/toolicon/32x32/true_darts.png:/toolicon/32x32/true_darts.png
@@ -386,7 +386,7 @@
Tools for creating lines.
-
+
:/icon/16x16/toolsectionline.png:/icon/16x16/toolsectionline.png
@@ -472,7 +472,7 @@
Tools for creating curves.
-
+
:/icon/16x16/toolsectioncurve.png:/icon/16x16/toolsectioncurve.png
@@ -636,7 +636,7 @@
Tools for creating arcs.
-
+
:/icon/16x16/toolsectionarc.png:/icon/16x16/toolsectionarc.png
@@ -878,7 +878,7 @@
Tools for creating details.
-
+
:/icon/16x16/toolsectiondetail.png:/icon/16x16/toolsectiondetail.png
@@ -955,7 +955,7 @@
-
+
:/icon/16x16/toolsectionlayout.png:/icon/16x16/toolsectionlayout.png
@@ -1414,7 +1414,7 @@
false
-
+
:/icon/32x32/draw.png:/icon/32x32/draw.png
@@ -1435,7 +1435,7 @@
false
-
+
:/icon/32x32/kontur.png:/icon/32x32/kontur.png
@@ -1456,7 +1456,7 @@
true
-
+
:/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png
@@ -1471,7 +1471,7 @@
false
-
+
:/icon/32x32/new_draw.png:/icon/32x32/new_draw.png
@@ -1489,7 +1489,7 @@
false
-
+
:/icon/32x32/option_draw.png:/icon/32x32/option_draw.png
@@ -1507,7 +1507,7 @@
false
-
+
:/icon/32x32/table.png:/icon/32x32/table.png
@@ -1528,7 +1528,7 @@
false
-
+
:/icon/32x32/history.png:/icon/32x32/history.png
@@ -1546,7 +1546,7 @@
false
-
+
:/icon/32x32/layout.png:/icon/32x32/layout.png
@@ -1750,7 +1750,7 @@
false
-
+
:/icon/32x32/pdf.png:/icon/32x32/pdf.png
@@ -1765,7 +1765,7 @@
false
-
+
:/icon/32x32/pdf.png:/icon/32x32/pdf.png
@@ -1844,7 +1844,7 @@
false
-
+
:/icon/32x32/export_to_picture_document.png:/icon/32x32/export_to_picture_document.png
@@ -1867,8 +1867,8 @@
toolButtonSplinePath
-
+
diff --git a/src/app/valentina/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc
index 116a34024..45c37ec85 100644
--- a/src/app/valentina/share/resources/toolicon.qrc
+++ b/src/app/valentina/share/resources/toolicon.qrc
@@ -27,5 +27,6 @@
toolicon/32x32/union.png
toolicon/32x32/new_detail.png
toolicon/32x32/arc_with_length.png
+ toolicon/32x32/true_darts.png
diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index 78de7ea02..ebf18411d 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -49,7 +49,6 @@ include(valentina.pri)
# Resource files. This files will be included in binary.
RESOURCES += \
- share/resources/icon.qrc \ # All other icons except cursors and Windows theme.
share/resources/cursor.qrc \ # Tools cursor icons.
share/resources/measurements.qrc \ # For measurements files that we save as resource.
share/resources/flags.qrc \
diff --git a/src/app/valentina/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc
similarity index 97%
rename from src/app/valentina/share/resources/icon.qrc
rename to src/libs/vmisc/share/resources/icon.qrc
index eb828ddf1..b9c6b0aaa 100644
--- a/src/app/valentina/share/resources/icon.qrc
+++ b/src/libs/vmisc/share/resources/icon.qrc
@@ -45,7 +45,6 @@
icon/16x16/toolsectionpoint.png
icon/16x16/toolsectiondetail.png
icon/16x16/toolsectionlayout.png
- toolicon/32x32/true_darts.png
icon/24x24/fast_forward_left_to_right_arrow.png
icon/24x24/fast_forward_right_to_left_arrow.png
icon/24x24/left_to_right_arrow.png
diff --git a/src/app/valentina/share/resources/icon/16x16/fx.png b/src/libs/vmisc/share/resources/icon/16x16/fx.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/fx.png
rename to src/libs/vmisc/share/resources/icon/16x16/fx.png
diff --git a/src/app/valentina/share/resources/icon/16x16/info.png b/src/libs/vmisc/share/resources/icon/16x16/info.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/info.png
rename to src/libs/vmisc/share/resources/icon/16x16/info.png
diff --git a/src/app/valentina/share/resources/icon/16x16/landscape.png b/src/libs/vmisc/share/resources/icon/16x16/landscape.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/landscape.png
rename to src/libs/vmisc/share/resources/icon/16x16/landscape.png
diff --git a/src/app/valentina/share/resources/icon/16x16/measurement.png b/src/libs/vmisc/share/resources/icon/16x16/measurement.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/measurement.png
rename to src/libs/vmisc/share/resources/icon/16x16/measurement.png
diff --git a/src/app/valentina/share/resources/icon/16x16/mirror.png b/src/libs/vmisc/share/resources/icon/16x16/mirror.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/mirror.png
rename to src/libs/vmisc/share/resources/icon/16x16/mirror.png
diff --git a/src/app/valentina/share/resources/icon/16x16/portrait.png b/src/libs/vmisc/share/resources/icon/16x16/portrait.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/portrait.png
rename to src/libs/vmisc/share/resources/icon/16x16/portrait.png
diff --git a/src/app/valentina/share/resources/icon/16x16/progress.gif b/src/libs/vmisc/share/resources/icon/16x16/progress.gif
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/progress.gif
rename to src/libs/vmisc/share/resources/icon/16x16/progress.gif
diff --git a/src/app/valentina/share/resources/icon/16x16/roll.png b/src/libs/vmisc/share/resources/icon/16x16/roll.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/roll.png
rename to src/libs/vmisc/share/resources/icon/16x16/roll.png
diff --git a/src/app/valentina/share/resources/icon/16x16/template.png b/src/libs/vmisc/share/resources/icon/16x16/template.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/template.png
rename to src/libs/vmisc/share/resources/icon/16x16/template.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectionarc.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectionarc.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectionarc.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectioncurve.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectioncurve.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectioncurve.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectiondetail.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectiondetail.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectiondetail.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectionlayout.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectionlayout.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectionlayout.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectionline.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionline.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectionline.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectionline.png
diff --git a/src/app/valentina/share/resources/icon/16x16/toolsectionpoint.png b/src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/16x16/toolsectionpoint.png
rename to src/libs/vmisc/share/resources/icon/16x16/toolsectionpoint.png
diff --git a/src/app/valentina/share/resources/icon/24x24/equal.png b/src/libs/vmisc/share/resources/icon/24x24/equal.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/equal.png
rename to src/libs/vmisc/share/resources/icon/24x24/equal.png
diff --git a/src/app/valentina/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
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png
rename to src/libs/vmisc/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png
diff --git a/src/app/valentina/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
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png
rename to src/libs/vmisc/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png
diff --git a/src/app/valentina/share/resources/icon/24x24/fx.png b/src/libs/vmisc/share/resources/icon/24x24/fx.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/fx.png
rename to src/libs/vmisc/share/resources/icon/24x24/fx.png
diff --git a/src/app/valentina/share/resources/icon/24x24/left_to_right_arrow.png b/src/libs/vmisc/share/resources/icon/24x24/left_to_right_arrow.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/left_to_right_arrow.png
rename to src/libs/vmisc/share/resources/icon/24x24/left_to_right_arrow.png
diff --git a/src/app/valentina/share/resources/icon/24x24/putHere.png b/src/libs/vmisc/share/resources/icon/24x24/putHere.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/putHere.png
rename to src/libs/vmisc/share/resources/icon/24x24/putHere.png
diff --git a/src/app/valentina/share/resources/icon/24x24/right_to_left_arrow.png b/src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/24x24/right_to_left_arrow.png
rename to src/libs/vmisc/share/resources/icon/24x24/right_to_left_arrow.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowDown.png b/src/libs/vmisc/share/resources/icon/32x32/arrowDown.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowDown.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowDown.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowLeft.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowLeft.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowLeft.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowLeftDown.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowLeftDown.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowLeftDown.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowLeftUp.png b/src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowLeftUp.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowLeftUp.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowRight.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRight.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowRight.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowRight.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowRightDown.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowRightDown.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowRightDown.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowRightUp.png b/src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowRightUp.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowRightUp.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrowUp.png b/src/libs/vmisc/share/resources/icon/32x32/arrowUp.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrowUp.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrowUp.png
diff --git a/src/app/valentina/share/resources/icon/32x32/arrow_cursor.png b/src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/arrow_cursor.png
rename to src/libs/vmisc/share/resources/icon/32x32/arrow_cursor.png
diff --git a/src/app/valentina/share/resources/icon/32x32/clockwise.png b/src/libs/vmisc/share/resources/icon/32x32/clockwise.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/clockwise.png
rename to src/libs/vmisc/share/resources/icon/32x32/clockwise.png
diff --git a/src/app/valentina/share/resources/icon/32x32/draw.png b/src/libs/vmisc/share/resources/icon/32x32/draw.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/draw.png
rename to src/libs/vmisc/share/resources/icon/32x32/draw.png
diff --git a/src/app/valentina/share/resources/icon/32x32/export_to_picture_document.png b/src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/export_to_picture_document.png
rename to src/libs/vmisc/share/resources/icon/32x32/export_to_picture_document.png
diff --git a/src/app/valentina/share/resources/icon/32x32/history.png b/src/libs/vmisc/share/resources/icon/32x32/history.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/history.png
rename to src/libs/vmisc/share/resources/icon/32x32/history.png
diff --git a/src/app/valentina/share/resources/icon/32x32/kontur.png b/src/libs/vmisc/share/resources/icon/32x32/kontur.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/kontur.png
rename to src/libs/vmisc/share/resources/icon/32x32/kontur.png
diff --git a/src/app/valentina/share/resources/icon/32x32/layout.png b/src/libs/vmisc/share/resources/icon/32x32/layout.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/layout.png
rename to src/libs/vmisc/share/resources/icon/32x32/layout.png
diff --git a/src/app/valentina/share/resources/icon/32x32/new_draw.png b/src/libs/vmisc/share/resources/icon/32x32/new_draw.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/new_draw.png
rename to src/libs/vmisc/share/resources/icon/32x32/new_draw.png
diff --git a/src/app/valentina/share/resources/icon/32x32/option_draw.png b/src/libs/vmisc/share/resources/icon/32x32/option_draw.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/option_draw.png
rename to src/libs/vmisc/share/resources/icon/32x32/option_draw.png
diff --git a/src/app/valentina/share/resources/icon/32x32/pdf.png b/src/libs/vmisc/share/resources/icon/32x32/pdf.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/pdf.png
rename to src/libs/vmisc/share/resources/icon/32x32/pdf.png
diff --git a/src/app/valentina/share/resources/icon/32x32/putHereLeft.png b/src/libs/vmisc/share/resources/icon/32x32/putHereLeft.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/putHereLeft.png
rename to src/libs/vmisc/share/resources/icon/32x32/putHereLeft.png
diff --git a/src/app/valentina/share/resources/icon/32x32/put_after.png b/src/libs/vmisc/share/resources/icon/32x32/put_after.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/put_after.png
rename to src/libs/vmisc/share/resources/icon/32x32/put_after.png
diff --git a/src/app/valentina/share/resources/icon/32x32/table.png b/src/libs/vmisc/share/resources/icon/32x32/table.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/32x32/table.png
rename to src/libs/vmisc/share/resources/icon/32x32/table.png
diff --git a/src/app/valentina/share/resources/icon/64x64/icon64x64.ico b/src/libs/vmisc/share/resources/icon/64x64/icon64x64.ico
similarity index 100%
rename from src/app/valentina/share/resources/icon/64x64/icon64x64.ico
rename to src/libs/vmisc/share/resources/icon/64x64/icon64x64.ico
diff --git a/src/app/valentina/share/resources/icon/64x64/icon64x64.png b/src/libs/vmisc/share/resources/icon/64x64/icon64x64.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/64x64/icon64x64.png
rename to src/libs/vmisc/share/resources/icon/64x64/icon64x64.png
diff --git a/src/app/valentina/share/resources/icon/Graduation.png b/src/libs/vmisc/share/resources/icon/Graduation.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/Graduation.png
rename to src/libs/vmisc/share/resources/icon/Graduation.png
diff --git a/src/app/valentina/share/resources/icon/community_config.png b/src/libs/vmisc/share/resources/icon/community_config.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/community_config.png
rename to src/libs/vmisc/share/resources/icon/community_config.png
diff --git a/src/app/valentina/share/resources/icon/config.png b/src/libs/vmisc/share/resources/icon/config.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/config.png
rename to src/libs/vmisc/share/resources/icon/config.png
diff --git a/src/app/valentina/share/resources/icon/individual.png b/src/libs/vmisc/share/resources/icon/individual.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/individual.png
rename to src/libs/vmisc/share/resources/icon/individual.png
diff --git a/src/app/valentina/share/resources/icon/logo.svg b/src/libs/vmisc/share/resources/icon/logo.svg
similarity index 100%
rename from src/app/valentina/share/resources/icon/logo.svg
rename to src/libs/vmisc/share/resources/icon/logo.svg
diff --git a/src/app/valentina/share/resources/icon/path_config.png b/src/libs/vmisc/share/resources/icon/path_config.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/path_config.png
rename to src/libs/vmisc/share/resources/icon/path_config.png
diff --git a/src/app/valentina/share/resources/icon/pattern_config.png b/src/libs/vmisc/share/resources/icon/pattern_config.png
similarity index 100%
rename from src/app/valentina/share/resources/icon/pattern_config.png
rename to src/libs/vmisc/share/resources/icon/pattern_config.png
diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro
index 30e81c05e..0c379ae64 100644
--- a/src/libs/vmisc/vmisc.pro
+++ b/src/libs/vmisc/vmisc.pro
@@ -31,6 +31,7 @@ include(vmisc.pri)
# Resource files. This files will be included in binary.
RESOURCES += \
share/resources/theme.qrc \ # Windows theme icons.
+ share/resources/icon.qrc # All other icons except cursors and Windows theme.
# This is static library so no need in "make install"
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
index ade596dec..3bc47a842 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
@@ -17,7 +17,7 @@
Edit formula
-
+
:/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png
@@ -98,7 +98,7 @@
...
-
+
:/icon/24x24/putHere.png:/icon/24x24/putHere.png
@@ -115,7 +115,7 @@
- :/icon/24x24/equal.png
+ :/icon/24x24/equal.png
@@ -416,7 +416,7 @@
buttonBox
-
+