diff --git a/share/all_measurements_with_descriptions.pdf b/share/all_measurements_with_descriptions.pdf
deleted file mode 100644
index 31d109dc9..000000000
Binary files a/share/all_measurements_with_descriptions.pdf and /dev/null differ
diff --git a/share/measurement-body-diagram.svg b/share/measurement-body-diagram.svg
deleted file mode 100644
index 480815879..000000000
--- a/share/measurement-body-diagram.svg
+++ /dev/null
@@ -1,16085 +0,0 @@
-
-
-
-
diff --git a/share/measurement-body-points.svg b/share/measurement-body-points.svg
deleted file mode 100644
index 0e5037f50..000000000
--- a/share/measurement-body-points.svg
+++ /dev/null
@@ -1,1508 +0,0 @@
-
-
-
-
diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp
index 56a0cb37e..dbc45427a 100644
--- a/src/app/puzzle/vpapplication.cpp
+++ b/src/app/puzzle/vpapplication.cpp
@@ -439,7 +439,7 @@ void VPApplication::InitOptions()
QString country = VGAnalytics::CountryCode();
if (country == "ru"_L1 || country == "by"_L1)
{
- qFatal("contry not detected");
+ qFatal("country not detected");
}
});
diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp
index 0a54df11b..08898db30 100644
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@@ -487,7 +487,7 @@ void MApplication::InitOptions()
QString country = VGAnalytics::CountryCode();
if (country == "ru"_L1 || country == "by"_L1)
{
- qFatal("contry not detected");
+ qFatal("country not detected");
}
});
@@ -495,8 +495,6 @@ void MApplication::InitOptions()
VTheme::SetIconTheme();
VTheme::InitThemeMode();
- QResource::registerResource(diagramsPath());
-
auto *statistic = VGAnalytics::Instance();
QString clientID = settings->GetClientID();
if (clientID.isEmpty())
@@ -593,54 +591,6 @@ auto MApplication::TapeSettings() -> VTapeSettings *
return qobject_cast(settings);
}
-//---------------------------------------------------------------------------------------------------------------------
-auto MApplication::diagramsPath() -> QString
-{
- const QString dPath = QStringLiteral("/diagrams.rcc");
-#ifdef Q_OS_WIN
- return QCoreApplication::applicationDirPath() + dPath;
-#elif defined(Q_OS_MAC)
- QFileInfo fileBundle(QCoreApplication::applicationDirPath() + QStringLiteral("/../Resources") + dPath);
- if (fileBundle.exists())
- {
- return fileBundle.absoluteFilePath();
- }
- else
- {
- QFileInfo file(QCoreApplication::applicationDirPath() + dPath);
- if (file.exists())
- {
- return file.absoluteFilePath();
- }
- else
- {
- return PKGDATADIR + dPath;
- }
- }
-#else // Unix
- QFileInfo file(QCoreApplication::applicationDirPath() + dPath);
- if (file.exists())
- {
- return file.absoluteFilePath();
- }
-
-#ifdef QBS_BUILD
- file = QFileInfo(QCoreApplication::applicationDirPath() + "/../../.." + PKGDATADIR + dPath);
- if (file.exists())
- {
- return file.absoluteFilePath();
- }
-#endif // QBS_BUILD
-
-#if defined(APPIMAGE) && defined(Q_OS_LINUX)
- /* Fix path to diagrams when run inside AppImage. */
- return AppImageRoot() + PKGDATADIR + dPath;
-#else
- return PKGDATADIR + dPath;
-#endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
-#endif // Unix
-}
-
//---------------------------------------------------------------------------------------------------------------------
void MApplication::RetranslateTables()
{
@@ -674,7 +624,7 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS
{
qCDebug(mApp, "Connected to the server '%s'", qUtf8Printable(serverName));
QTextStream stream(&socket);
- stream << QCoreApplication::arguments().join(QStringLiteral(";;"));
+ stream << QCoreApplication::arguments().join(";;"_L1);
stream.flush();
socket.waitForBytesWritten();
QCoreApplication::exit(V_EX_OK);
diff --git a/src/app/tape/mapplication.h b/src/app/tape/mapplication.h
index 04e3aa921..5cae4a7f4 100644
--- a/src/app/tape/mapplication.h
+++ b/src/app/tape/mapplication.h
@@ -68,8 +68,6 @@ public:
void OpenSettings() override;
auto TapeSettings() -> VTapeSettings *;
- static auto diagramsPath() -> QString;
-
void RetranslateTables();
void ParseCommandLine(const SocketConnection &connection, const QStringList &arguments);
diff --git a/src/app/tape/share/resources/diagrams.qrc b/src/app/tape/share/resources/diagrams.qrc
deleted file mode 100644
index 1eb0d234d..000000000
--- a/src/app/tape/share/resources/diagrams.qrc
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
- diagrams/Ap1.svg
- diagrams/Ap2.svg
- diagrams/Bp1.svg
- diagrams/Bp2.svg
- diagrams/Cp1.svg
- diagrams/Cp2.svg
- diagrams/Dp1.svg
- diagrams/Dp2.svg
- diagrams/Dp3.svg
- diagrams/Ep1.svg
- diagrams/Ep2.svg
- diagrams/Fp1.svg
- diagrams/Fp2.svg
- diagrams/Fp3.svg
- diagrams/Gp1.svg
- diagrams/Gp2.svg
- diagrams/Gp3.svg
- diagrams/Gp4.svg
- diagrams/Gp5.svg
- diagrams/Gp6.svg
- diagrams/Gp7.svg
- diagrams/Gp8.svg
- diagrams/Gp9.svg
- diagrams/Hp1.svg
- diagrams/Hp2.svg
- diagrams/Hp3.svg
- diagrams/Hp4.svg
- diagrams/Hp5.svg
- diagrams/Hp6.svg
- diagrams/Hp7.svg
- diagrams/Hp8.svg
- diagrams/Hp9.svg
- diagrams/Hp10.svg
- diagrams/Hp11.svg
- diagrams/Hp12.svg
- diagrams/Hp13.svg
- diagrams/Ip1.svg
- diagrams/Ip2.svg
- diagrams/Ip3.svg
- diagrams/Ip4.svg
- diagrams/Ip5.svg
- diagrams/Ip6.svg
- diagrams/Ip7.svg
- diagrams/Jp1.svg
- diagrams/Jp2.svg
- diagrams/Jp3.svg
- diagrams/Jp4.svg
- diagrams/Jp5.svg
- diagrams/Jp6.svg
- diagrams/Kp1.svg
- diagrams/Kp2.svg
- diagrams/Kp3.svg
- diagrams/Kp4.svg
- diagrams/Kp5.svg
- diagrams/Kp6.svg
- diagrams/Kp7.svg
- diagrams/Kp8.svg
- diagrams/Kp9.svg
- diagrams/Kp10.svg
- diagrams/Kp11.svg
- diagrams/Lp1.svg
- diagrams/Lp2.svg
- diagrams/Lp3.svg
- diagrams/Lp4.svg
- diagrams/Lp5.svg
- diagrams/Lp6.svg
- diagrams/Lp7.svg
- diagrams/Lp8.svg
- diagrams/Lp9.svg
- diagrams/Lp10.svg
- diagrams/Mp1.svg
- diagrams/Mp2.svg
- diagrams/Mp3.svg
- diagrams/Np1.svg
- diagrams/Np2.svg
- diagrams/Np3.svg
- diagrams/Np4.svg
- diagrams/Np5.svg
- diagrams/Op1.svg
- diagrams/Op2.svg
- diagrams/Op3.svg
- diagrams/Op4.svg
- diagrams/Op5.svg
- diagrams/Op6.svg
- diagrams/Op7.svg
- diagrams/Op8.svg
- diagrams/Op9.svg
- diagrams/Op10.svg
- diagrams/Op11.svg
- diagrams/Pp1.svg
- diagrams/Pp2.svg
- diagrams/Pp3.svg
- diagrams/Pp4.svg
- diagrams/Pp5.svg
- diagrams/Pp6.svg
- diagrams/Pp7.svg
- diagrams/Pp8.svg
- diagrams/Pp9.svg
- diagrams/Pp10.svg
- diagrams/Pp11.svg
- diagrams/Pp12.svg
- diagrams/Qp1.svg
- diagrams/Qp2.svg
- diagrams/Qp3.svg
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ap1.svg b/src/app/tape/share/resources/diagrams/Ap1.svg
deleted file mode 100644
index 41c34591c..000000000
--- a/src/app/tape/share/resources/diagrams/Ap1.svg
+++ /dev/null
@@ -1,725 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ap2.svg b/src/app/tape/share/resources/diagrams/Ap2.svg
deleted file mode 100644
index 33c5b2b0f..000000000
--- a/src/app/tape/share/resources/diagrams/Ap2.svg
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Bp1.svg b/src/app/tape/share/resources/diagrams/Bp1.svg
deleted file mode 100644
index 05240a46f..000000000
--- a/src/app/tape/share/resources/diagrams/Bp1.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Bp2.svg b/src/app/tape/share/resources/diagrams/Bp2.svg
deleted file mode 100644
index 171ca953c..000000000
--- a/src/app/tape/share/resources/diagrams/Bp2.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Cp1.svg b/src/app/tape/share/resources/diagrams/Cp1.svg
deleted file mode 100644
index cecd8b34e..000000000
--- a/src/app/tape/share/resources/diagrams/Cp1.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Cp2.svg b/src/app/tape/share/resources/diagrams/Cp2.svg
deleted file mode 100644
index 9f2d65b85..000000000
--- a/src/app/tape/share/resources/diagrams/Cp2.svg
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Dp1.svg b/src/app/tape/share/resources/diagrams/Dp1.svg
deleted file mode 100644
index f22191f46..000000000
--- a/src/app/tape/share/resources/diagrams/Dp1.svg
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Dp2.svg b/src/app/tape/share/resources/diagrams/Dp2.svg
deleted file mode 100644
index 2e6f10d61..000000000
--- a/src/app/tape/share/resources/diagrams/Dp2.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Dp3.svg b/src/app/tape/share/resources/diagrams/Dp3.svg
deleted file mode 100644
index 746d19b4c..000000000
--- a/src/app/tape/share/resources/diagrams/Dp3.svg
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ep1.svg b/src/app/tape/share/resources/diagrams/Ep1.svg
deleted file mode 100644
index 8ab28fc71..000000000
--- a/src/app/tape/share/resources/diagrams/Ep1.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ep2.svg b/src/app/tape/share/resources/diagrams/Ep2.svg
deleted file mode 100644
index 1af890cb9..000000000
--- a/src/app/tape/share/resources/diagrams/Ep2.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Fp1.svg b/src/app/tape/share/resources/diagrams/Fp1.svg
deleted file mode 100644
index 68d281fc7..000000000
--- a/src/app/tape/share/resources/diagrams/Fp1.svg
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Fp2.svg b/src/app/tape/share/resources/diagrams/Fp2.svg
deleted file mode 100644
index babb6d89f..000000000
--- a/src/app/tape/share/resources/diagrams/Fp2.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Fp3.svg b/src/app/tape/share/resources/diagrams/Fp3.svg
deleted file mode 100644
index 02e06dd9d..000000000
--- a/src/app/tape/share/resources/diagrams/Fp3.svg
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp1.svg b/src/app/tape/share/resources/diagrams/Gp1.svg
deleted file mode 100644
index ea740537d..000000000
--- a/src/app/tape/share/resources/diagrams/Gp1.svg
+++ /dev/null
@@ -1,343 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp2.svg b/src/app/tape/share/resources/diagrams/Gp2.svg
deleted file mode 100644
index 12ddc3739..000000000
--- a/src/app/tape/share/resources/diagrams/Gp2.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp3.svg b/src/app/tape/share/resources/diagrams/Gp3.svg
deleted file mode 100644
index b4ab044a3..000000000
--- a/src/app/tape/share/resources/diagrams/Gp3.svg
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp4.svg b/src/app/tape/share/resources/diagrams/Gp4.svg
deleted file mode 100644
index 529fb8ab6..000000000
--- a/src/app/tape/share/resources/diagrams/Gp4.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp5.svg b/src/app/tape/share/resources/diagrams/Gp5.svg
deleted file mode 100644
index abd1ac080..000000000
--- a/src/app/tape/share/resources/diagrams/Gp5.svg
+++ /dev/null
@@ -1,276 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp6.svg b/src/app/tape/share/resources/diagrams/Gp6.svg
deleted file mode 100644
index f8b67fe81..000000000
--- a/src/app/tape/share/resources/diagrams/Gp6.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp7.svg b/src/app/tape/share/resources/diagrams/Gp7.svg
deleted file mode 100644
index a75598bf3..000000000
--- a/src/app/tape/share/resources/diagrams/Gp7.svg
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp8.svg b/src/app/tape/share/resources/diagrams/Gp8.svg
deleted file mode 100644
index 08a9627ef..000000000
--- a/src/app/tape/share/resources/diagrams/Gp8.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Gp9.svg b/src/app/tape/share/resources/diagrams/Gp9.svg
deleted file mode 100644
index f2419460c..000000000
--- a/src/app/tape/share/resources/diagrams/Gp9.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp1.svg b/src/app/tape/share/resources/diagrams/Hp1.svg
deleted file mode 100644
index eeed861a7..000000000
--- a/src/app/tape/share/resources/diagrams/Hp1.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp10.svg b/src/app/tape/share/resources/diagrams/Hp10.svg
deleted file mode 100644
index a278d507b..000000000
--- a/src/app/tape/share/resources/diagrams/Hp10.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp11.svg b/src/app/tape/share/resources/diagrams/Hp11.svg
deleted file mode 100644
index 364123053..000000000
--- a/src/app/tape/share/resources/diagrams/Hp11.svg
+++ /dev/null
@@ -1,396 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp12.svg b/src/app/tape/share/resources/diagrams/Hp12.svg
deleted file mode 100644
index e443af7f1..000000000
--- a/src/app/tape/share/resources/diagrams/Hp12.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp13.svg b/src/app/tape/share/resources/diagrams/Hp13.svg
deleted file mode 100644
index 0561bed8e..000000000
--- a/src/app/tape/share/resources/diagrams/Hp13.svg
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp2.svg b/src/app/tape/share/resources/diagrams/Hp2.svg
deleted file mode 100644
index 70d1a376c..000000000
--- a/src/app/tape/share/resources/diagrams/Hp2.svg
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp3.svg b/src/app/tape/share/resources/diagrams/Hp3.svg
deleted file mode 100644
index 4ddd185b2..000000000
--- a/src/app/tape/share/resources/diagrams/Hp3.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp4.svg b/src/app/tape/share/resources/diagrams/Hp4.svg
deleted file mode 100644
index 7a08f0899..000000000
--- a/src/app/tape/share/resources/diagrams/Hp4.svg
+++ /dev/null
@@ -1,331 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp5.svg b/src/app/tape/share/resources/diagrams/Hp5.svg
deleted file mode 100644
index b55c9e207..000000000
--- a/src/app/tape/share/resources/diagrams/Hp5.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp6.svg b/src/app/tape/share/resources/diagrams/Hp6.svg
deleted file mode 100644
index cd9f282af..000000000
--- a/src/app/tape/share/resources/diagrams/Hp6.svg
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp7.svg b/src/app/tape/share/resources/diagrams/Hp7.svg
deleted file mode 100644
index 71ed2206c..000000000
--- a/src/app/tape/share/resources/diagrams/Hp7.svg
+++ /dev/null
@@ -1,285 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp8.svg b/src/app/tape/share/resources/diagrams/Hp8.svg
deleted file mode 100644
index 738f60e14..000000000
--- a/src/app/tape/share/resources/diagrams/Hp8.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Hp9.svg b/src/app/tape/share/resources/diagrams/Hp9.svg
deleted file mode 100644
index 11cf14a69..000000000
--- a/src/app/tape/share/resources/diagrams/Hp9.svg
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip1.svg b/src/app/tape/share/resources/diagrams/Ip1.svg
deleted file mode 100644
index fbfc5848a..000000000
--- a/src/app/tape/share/resources/diagrams/Ip1.svg
+++ /dev/null
@@ -1,269 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip2.svg b/src/app/tape/share/resources/diagrams/Ip2.svg
deleted file mode 100644
index fe21ead31..000000000
--- a/src/app/tape/share/resources/diagrams/Ip2.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip3.svg b/src/app/tape/share/resources/diagrams/Ip3.svg
deleted file mode 100644
index f84788748..000000000
--- a/src/app/tape/share/resources/diagrams/Ip3.svg
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip4.svg b/src/app/tape/share/resources/diagrams/Ip4.svg
deleted file mode 100644
index 677e5cd38..000000000
--- a/src/app/tape/share/resources/diagrams/Ip4.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip5.svg b/src/app/tape/share/resources/diagrams/Ip5.svg
deleted file mode 100644
index dd97f924b..000000000
--- a/src/app/tape/share/resources/diagrams/Ip5.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip6.svg b/src/app/tape/share/resources/diagrams/Ip6.svg
deleted file mode 100644
index 8aca494d7..000000000
--- a/src/app/tape/share/resources/diagrams/Ip6.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Ip7.svg b/src/app/tape/share/resources/diagrams/Ip7.svg
deleted file mode 100644
index bde4a3149..000000000
--- a/src/app/tape/share/resources/diagrams/Ip7.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp1.svg b/src/app/tape/share/resources/diagrams/Jp1.svg
deleted file mode 100644
index 677fd9cd0..000000000
--- a/src/app/tape/share/resources/diagrams/Jp1.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp2.svg b/src/app/tape/share/resources/diagrams/Jp2.svg
deleted file mode 100644
index 8f12b5707..000000000
--- a/src/app/tape/share/resources/diagrams/Jp2.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp3.svg b/src/app/tape/share/resources/diagrams/Jp3.svg
deleted file mode 100644
index 59fca3048..000000000
--- a/src/app/tape/share/resources/diagrams/Jp3.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp4.svg b/src/app/tape/share/resources/diagrams/Jp4.svg
deleted file mode 100644
index 5a38347cf..000000000
--- a/src/app/tape/share/resources/diagrams/Jp4.svg
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp5.svg b/src/app/tape/share/resources/diagrams/Jp5.svg
deleted file mode 100644
index 0186f1cdf..000000000
--- a/src/app/tape/share/resources/diagrams/Jp5.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Jp6.svg b/src/app/tape/share/resources/diagrams/Jp6.svg
deleted file mode 100644
index a152c9e0d..000000000
--- a/src/app/tape/share/resources/diagrams/Jp6.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp1.svg b/src/app/tape/share/resources/diagrams/Kp1.svg
deleted file mode 100644
index 5e551a048..000000000
--- a/src/app/tape/share/resources/diagrams/Kp1.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp10.svg b/src/app/tape/share/resources/diagrams/Kp10.svg
deleted file mode 100644
index 48e482000..000000000
--- a/src/app/tape/share/resources/diagrams/Kp10.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp11.svg b/src/app/tape/share/resources/diagrams/Kp11.svg
deleted file mode 100644
index c563eb5a9..000000000
--- a/src/app/tape/share/resources/diagrams/Kp11.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp2.svg b/src/app/tape/share/resources/diagrams/Kp2.svg
deleted file mode 100644
index 6db96ba77..000000000
--- a/src/app/tape/share/resources/diagrams/Kp2.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp3.svg b/src/app/tape/share/resources/diagrams/Kp3.svg
deleted file mode 100644
index 138aa4d4e..000000000
--- a/src/app/tape/share/resources/diagrams/Kp3.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp4.svg b/src/app/tape/share/resources/diagrams/Kp4.svg
deleted file mode 100644
index 4345873a0..000000000
--- a/src/app/tape/share/resources/diagrams/Kp4.svg
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp5.svg b/src/app/tape/share/resources/diagrams/Kp5.svg
deleted file mode 100644
index 993528427..000000000
--- a/src/app/tape/share/resources/diagrams/Kp5.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp6.svg b/src/app/tape/share/resources/diagrams/Kp6.svg
deleted file mode 100644
index 58ad2c266..000000000
--- a/src/app/tape/share/resources/diagrams/Kp6.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp7.svg b/src/app/tape/share/resources/diagrams/Kp7.svg
deleted file mode 100644
index 562a6de9f..000000000
--- a/src/app/tape/share/resources/diagrams/Kp7.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp8.svg b/src/app/tape/share/resources/diagrams/Kp8.svg
deleted file mode 100644
index 469306074..000000000
--- a/src/app/tape/share/resources/diagrams/Kp8.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Kp9.svg b/src/app/tape/share/resources/diagrams/Kp9.svg
deleted file mode 100644
index ef04d6f50..000000000
--- a/src/app/tape/share/resources/diagrams/Kp9.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp1.svg b/src/app/tape/share/resources/diagrams/Lp1.svg
deleted file mode 100644
index 025bf152b..000000000
--- a/src/app/tape/share/resources/diagrams/Lp1.svg
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp10.svg b/src/app/tape/share/resources/diagrams/Lp10.svg
deleted file mode 100644
index 830e03eaa..000000000
--- a/src/app/tape/share/resources/diagrams/Lp10.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp2.svg b/src/app/tape/share/resources/diagrams/Lp2.svg
deleted file mode 100644
index 0317a71d0..000000000
--- a/src/app/tape/share/resources/diagrams/Lp2.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp3.svg b/src/app/tape/share/resources/diagrams/Lp3.svg
deleted file mode 100644
index 7ef822664..000000000
--- a/src/app/tape/share/resources/diagrams/Lp3.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp4.svg b/src/app/tape/share/resources/diagrams/Lp4.svg
deleted file mode 100644
index 25ead1a6c..000000000
--- a/src/app/tape/share/resources/diagrams/Lp4.svg
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp5.svg b/src/app/tape/share/resources/diagrams/Lp5.svg
deleted file mode 100644
index 0437cc5ab..000000000
--- a/src/app/tape/share/resources/diagrams/Lp5.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp6.svg b/src/app/tape/share/resources/diagrams/Lp6.svg
deleted file mode 100644
index 8110b85ed..000000000
--- a/src/app/tape/share/resources/diagrams/Lp6.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp7.svg b/src/app/tape/share/resources/diagrams/Lp7.svg
deleted file mode 100644
index 74b593030..000000000
--- a/src/app/tape/share/resources/diagrams/Lp7.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp8.svg b/src/app/tape/share/resources/diagrams/Lp8.svg
deleted file mode 100644
index 636d6c333..000000000
--- a/src/app/tape/share/resources/diagrams/Lp8.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Lp9.svg b/src/app/tape/share/resources/diagrams/Lp9.svg
deleted file mode 100644
index 7f7448add..000000000
--- a/src/app/tape/share/resources/diagrams/Lp9.svg
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Mp1.svg b/src/app/tape/share/resources/diagrams/Mp1.svg
deleted file mode 100644
index 571b8b90d..000000000
--- a/src/app/tape/share/resources/diagrams/Mp1.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Mp2.svg b/src/app/tape/share/resources/diagrams/Mp2.svg
deleted file mode 100644
index dbf367a21..000000000
--- a/src/app/tape/share/resources/diagrams/Mp2.svg
+++ /dev/null
@@ -1,460 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Mp3.svg b/src/app/tape/share/resources/diagrams/Mp3.svg
deleted file mode 100644
index 820e36bdf..000000000
--- a/src/app/tape/share/resources/diagrams/Mp3.svg
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Np1.svg b/src/app/tape/share/resources/diagrams/Np1.svg
deleted file mode 100644
index 94fd061a3..000000000
--- a/src/app/tape/share/resources/diagrams/Np1.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Np2.svg b/src/app/tape/share/resources/diagrams/Np2.svg
deleted file mode 100644
index 743bf6fbf..000000000
--- a/src/app/tape/share/resources/diagrams/Np2.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Np3.svg b/src/app/tape/share/resources/diagrams/Np3.svg
deleted file mode 100644
index 49f9b7794..000000000
--- a/src/app/tape/share/resources/diagrams/Np3.svg
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Np4.svg b/src/app/tape/share/resources/diagrams/Np4.svg
deleted file mode 100644
index 14b673440..000000000
--- a/src/app/tape/share/resources/diagrams/Np4.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Np5.svg b/src/app/tape/share/resources/diagrams/Np5.svg
deleted file mode 100644
index a104c7212..000000000
--- a/src/app/tape/share/resources/diagrams/Np5.svg
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op1.svg b/src/app/tape/share/resources/diagrams/Op1.svg
deleted file mode 100644
index 2eced04a6..000000000
--- a/src/app/tape/share/resources/diagrams/Op1.svg
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op10.svg b/src/app/tape/share/resources/diagrams/Op10.svg
deleted file mode 100644
index e9d83cd9d..000000000
--- a/src/app/tape/share/resources/diagrams/Op10.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op11.svg b/src/app/tape/share/resources/diagrams/Op11.svg
deleted file mode 100644
index 08968c141..000000000
--- a/src/app/tape/share/resources/diagrams/Op11.svg
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op2.svg b/src/app/tape/share/resources/diagrams/Op2.svg
deleted file mode 100644
index 064a91ed8..000000000
--- a/src/app/tape/share/resources/diagrams/Op2.svg
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op3.svg b/src/app/tape/share/resources/diagrams/Op3.svg
deleted file mode 100644
index ea8ab9bf8..000000000
--- a/src/app/tape/share/resources/diagrams/Op3.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op4.svg b/src/app/tape/share/resources/diagrams/Op4.svg
deleted file mode 100644
index c3bf590b9..000000000
--- a/src/app/tape/share/resources/diagrams/Op4.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op5.svg b/src/app/tape/share/resources/diagrams/Op5.svg
deleted file mode 100644
index 7f521c485..000000000
--- a/src/app/tape/share/resources/diagrams/Op5.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op6.svg b/src/app/tape/share/resources/diagrams/Op6.svg
deleted file mode 100644
index f6082f50d..000000000
--- a/src/app/tape/share/resources/diagrams/Op6.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op7.svg b/src/app/tape/share/resources/diagrams/Op7.svg
deleted file mode 100644
index 96f2b1da3..000000000
--- a/src/app/tape/share/resources/diagrams/Op7.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op8.svg b/src/app/tape/share/resources/diagrams/Op8.svg
deleted file mode 100644
index 93cc9c77a..000000000
--- a/src/app/tape/share/resources/diagrams/Op8.svg
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Op9.svg b/src/app/tape/share/resources/diagrams/Op9.svg
deleted file mode 100644
index 3836975d6..000000000
--- a/src/app/tape/share/resources/diagrams/Op9.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp1.svg b/src/app/tape/share/resources/diagrams/Pp1.svg
deleted file mode 100644
index d31a1ed05..000000000
--- a/src/app/tape/share/resources/diagrams/Pp1.svg
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp10.svg b/src/app/tape/share/resources/diagrams/Pp10.svg
deleted file mode 100644
index 47a9d2e49..000000000
--- a/src/app/tape/share/resources/diagrams/Pp10.svg
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp11.svg b/src/app/tape/share/resources/diagrams/Pp11.svg
deleted file mode 100644
index 4de14e66b..000000000
--- a/src/app/tape/share/resources/diagrams/Pp11.svg
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp12.svg b/src/app/tape/share/resources/diagrams/Pp12.svg
deleted file mode 100644
index 1228200ce..000000000
--- a/src/app/tape/share/resources/diagrams/Pp12.svg
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp2.svg b/src/app/tape/share/resources/diagrams/Pp2.svg
deleted file mode 100644
index fac1e5858..000000000
--- a/src/app/tape/share/resources/diagrams/Pp2.svg
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp3.svg b/src/app/tape/share/resources/diagrams/Pp3.svg
deleted file mode 100644
index 6cce6ac01..000000000
--- a/src/app/tape/share/resources/diagrams/Pp3.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp4.svg b/src/app/tape/share/resources/diagrams/Pp4.svg
deleted file mode 100644
index 77726d00e..000000000
--- a/src/app/tape/share/resources/diagrams/Pp4.svg
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp5.svg b/src/app/tape/share/resources/diagrams/Pp5.svg
deleted file mode 100644
index 82390b2d3..000000000
--- a/src/app/tape/share/resources/diagrams/Pp5.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp6.svg b/src/app/tape/share/resources/diagrams/Pp6.svg
deleted file mode 100644
index 6ba2578e0..000000000
--- a/src/app/tape/share/resources/diagrams/Pp6.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp7.svg b/src/app/tape/share/resources/diagrams/Pp7.svg
deleted file mode 100644
index d677cf4b7..000000000
--- a/src/app/tape/share/resources/diagrams/Pp7.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp8.svg b/src/app/tape/share/resources/diagrams/Pp8.svg
deleted file mode 100644
index eaded0c4c..000000000
--- a/src/app/tape/share/resources/diagrams/Pp8.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Pp9.svg b/src/app/tape/share/resources/diagrams/Pp9.svg
deleted file mode 100644
index e4ad8b94b..000000000
--- a/src/app/tape/share/resources/diagrams/Pp9.svg
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Qp1.svg b/src/app/tape/share/resources/diagrams/Qp1.svg
deleted file mode 100644
index 0ab30884c..000000000
--- a/src/app/tape/share/resources/diagrams/Qp1.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Qp2.svg b/src/app/tape/share/resources/diagrams/Qp2.svg
deleted file mode 100644
index 52691d61c..000000000
--- a/src/app/tape/share/resources/diagrams/Qp2.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/share/resources/diagrams/Qp3.svg b/src/app/tape/share/resources/diagrams/Qp3.svg
deleted file mode 100644
index a7170b026..000000000
--- a/src/app/tape/share/resources/diagrams/Qp3.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
index 095bb7cad..ad6d30870 100644
--- a/src/app/tape/tape.pro
+++ b/src/app/tape/tape.pro
@@ -63,128 +63,6 @@ include(tape.pri)
RESOURCES += \
share/resources/tapeicon.qrc
-DATA_RESOURCE = share/resources/diagrams.qrc # External Binary Resource
-
-# The list helps to check that all files are exist.
-# Don't forget to convert text to curves.
-DIAGRAMS += \
- $${PWD}/share/resources/diagrams/Ap1.svg \
- $${PWD}/share/resources/diagrams/Ap2.svg \
- $${PWD}/share/resources/diagrams/Bp1.svg \
- $${PWD}/share/resources/diagrams/Bp2.svg \
- $${PWD}/share/resources/diagrams/Cp1.svg \
- $${PWD}/share/resources/diagrams/Cp2.svg \
- $${PWD}/share/resources/diagrams/Dp1.svg \
- $${PWD}/share/resources/diagrams/Dp2.svg \
- $${PWD}/share/resources/diagrams/Dp3.svg \
- $${PWD}/share/resources/diagrams/Ep1.svg \
- $${PWD}/share/resources/diagrams/Ep2.svg \
- $${PWD}/share/resources/diagrams/Fp1.svg \
- $${PWD}/share/resources/diagrams/Fp2.svg \
- $${PWD}/share/resources/diagrams/Fp3.svg \
- $${PWD}/share/resources/diagrams/Gp1.svg \
- $${PWD}/share/resources/diagrams/Gp2.svg \
- $${PWD}/share/resources/diagrams/Gp3.svg \
- $${PWD}/share/resources/diagrams/Gp4.svg \
- $${PWD}/share/resources/diagrams/Gp5.svg \
- $${PWD}/share/resources/diagrams/Gp6.svg \
- $${PWD}/share/resources/diagrams/Gp7.svg \
- $${PWD}/share/resources/diagrams/Gp8.svg \
- $${PWD}/share/resources/diagrams/Gp9.svg \
- $${PWD}/share/resources/diagrams/Hp1.svg \
- $${PWD}/share/resources/diagrams/Hp2.svg \
- $${PWD}/share/resources/diagrams/Hp3.svg \
- $${PWD}/share/resources/diagrams/Hp4.svg \
- $${PWD}/share/resources/diagrams/Hp5.svg \
- $${PWD}/share/resources/diagrams/Hp6.svg \
- $${PWD}/share/resources/diagrams/Hp7.svg \
- $${PWD}/share/resources/diagrams/Hp8.svg \
- $${PWD}/share/resources/diagrams/Hp9.svg \
- $${PWD}/share/resources/diagrams/Hp10.svg \
- $${PWD}/share/resources/diagrams/Hp11.svg \
- $${PWD}/share/resources/diagrams/Hp12.svg \
- $${PWD}/share/resources/diagrams/Hp13.svg \
- $${PWD}/share/resources/diagrams/Ip1.svg \
- $${PWD}/share/resources/diagrams/Ip2.svg \
- $${PWD}/share/resources/diagrams/Ip3.svg \
- $${PWD}/share/resources/diagrams/Ip4.svg \
- $${PWD}/share/resources/diagrams/Ip5.svg \
- $${PWD}/share/resources/diagrams/Ip6.svg \
- $${PWD}/share/resources/diagrams/Ip7.svg \
- $${PWD}/share/resources/diagrams/Jp1.svg \
- $${PWD}/share/resources/diagrams/Jp2.svg \
- $${PWD}/share/resources/diagrams/Jp3.svg \
- $${PWD}/share/resources/diagrams/Jp4.svg \
- $${PWD}/share/resources/diagrams/Jp5.svg \
- $${PWD}/share/resources/diagrams/Jp6.svg \
- $${PWD}/share/resources/diagrams/Kp1.svg \
- $${PWD}/share/resources/diagrams/Kp2.svg \
- $${PWD}/share/resources/diagrams/Kp3.svg \
- $${PWD}/share/resources/diagrams/Kp4.svg \
- $${PWD}/share/resources/diagrams/Kp5.svg \
- $${PWD}/share/resources/diagrams/Kp6.svg \
- $${PWD}/share/resources/diagrams/Kp7.svg \
- $${PWD}/share/resources/diagrams/Kp8.svg \
- $${PWD}/share/resources/diagrams/Kp9.svg \
- $${PWD}/share/resources/diagrams/Kp10.svg \
- $${PWD}/share/resources/diagrams/Kp11.svg \
- $${PWD}/share/resources/diagrams/Lp1.svg \
- $${PWD}/share/resources/diagrams/Lp2.svg \
- $${PWD}/share/resources/diagrams/Lp3.svg \
- $${PWD}/share/resources/diagrams/Lp4.svg \
- $${PWD}/share/resources/diagrams/Lp5.svg \
- $${PWD}/share/resources/diagrams/Lp6.svg \
- $${PWD}/share/resources/diagrams/Lp7.svg \
- $${PWD}/share/resources/diagrams/Lp8.svg \
- $${PWD}/share/resources/diagrams/Lp9.svg \
- $${PWD}/share/resources/diagrams/Lp10.svg \
- $${PWD}/share/resources/diagrams/Mp1.svg \
- $${PWD}/share/resources/diagrams/Mp2.svg \
- $${PWD}/share/resources/diagrams/Mp3.svg \
- $${PWD}/share/resources/diagrams/Np1.svg \
- $${PWD}/share/resources/diagrams/Np2.svg \
- $${PWD}/share/resources/diagrams/Np3.svg \
- $${PWD}/share/resources/diagrams/Np4.svg \
- $${PWD}/share/resources/diagrams/Np5.svg \
- $${PWD}/share/resources/diagrams/Op1.svg \
- $${PWD}/share/resources/diagrams/Op2.svg \
- $${PWD}/share/resources/diagrams/Op3.svg \
- $${PWD}/share/resources/diagrams/Op4.svg \
- $${PWD}/share/resources/diagrams/Op5.svg \
- $${PWD}/share/resources/diagrams/Op6.svg \
- $${PWD}/share/resources/diagrams/Op7.svg \
- $${PWD}/share/resources/diagrams/Op8.svg \
- $${PWD}/share/resources/diagrams/Op9.svg \
- $${PWD}/share/resources/diagrams/Op10.svg \
- $${PWD}/share/resources/diagrams/Op11.svg \
- $${PWD}/share/resources/diagrams/Pp1.svg \
- $${PWD}/share/resources/diagrams/Pp2.svg \
- $${PWD}/share/resources/diagrams/Pp3.svg \
- $${PWD}/share/resources/diagrams/Pp4.svg \
- $${PWD}/share/resources/diagrams/Pp5.svg \
- $${PWD}/share/resources/diagrams/Pp6.svg \
- $${PWD}/share/resources/diagrams/Pp7.svg \
- $${PWD}/share/resources/diagrams/Pp8.svg \
- $${PWD}/share/resources/diagrams/Pp9.svg \
- $${PWD}/share/resources/diagrams/Pp10.svg \
- $${PWD}/share/resources/diagrams/Pp11.svg \
- $${PWD}/share/resources/diagrams/Pp12.svg \
- $${PWD}/share/resources/diagrams/Qp1.svg \
- $${PWD}/share/resources/diagrams/Qp2.svg \
- $${PWD}/share/resources/diagrams/Qp3.svg
-
-!exists($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) {
- diagrams.name = resource diagrams
- diagrams.CONFIG += no_link target_predeps
- diagrams.depends = $$DIAGRAMS # expects a list of files
- diagrams.input = DATA_RESOURCE # expects the name of a variable
- diagrams.output = ${QMAKE_FILE_BASE}.rcc
- diagrams.commands = $$shell_path($$[QT_INSTALL_BINS]/rcc) -binary -no-compress ${QMAKE_FILE_IN} -o $${OUT_PWD}/$${DESTDIR}/${QMAKE_FILE_OUT}
-
-QMAKE_EXTRA_COMPILERS += diagrams
-}
-
-QMAKE_CLEAN += $${OUT_PWD}/$${DESTDIR}/diagrams.rcc
include(../translations.pri)
# Set "make install" command for Unix-like systems.
@@ -193,13 +71,8 @@ unix{
# Path to bin file after installation
target.path = $$BINDIR
- rcc_diagrams.path = $$PKGDATADIR
- rcc_diagrams.files = $${OUT_PWD}/$${DESTDIR}/diagrams.rcc
- rcc_diagrams.CONFIG = no_check_exist
-
INSTALLS += \
- target \
- rcc_diagrams
+ target
}
macx{
# Some macx stuff
@@ -235,10 +108,6 @@ unix{
templates.path = $$RESOURCES_DIR/tables/templates/
templates.files = $$INSTALL_STANDARD_TEMPLATES
- # Copy to bundle multisize measurements files
- # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
- QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t)
-
format.path = $$RESOURCES_DIR/
format.files += $$PWD/../../../dist/macx/i-measurements.icns
format.files += $$PWD/../../../dist/macx/s-measurements.icns
diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs
index 414bf848b..532aab5ff 100644
--- a/src/app/tape/tape.qbs
+++ b/src/app/tape/tape.qbs
@@ -194,27 +194,6 @@ VToolApp {
fileTags: "freedesktop.512x512MimetypesIcons"
}
- Group {
- name: "Diagrams"
- prefix: product.sourceDirectory + "/share/resources/"
- files: "diagrams.qrc"
- fileTags: "ebr.external_qrc"
- }
-
- Group {
- fileTagsFilter: "ebr.rcc"
- qbs.install: true
- qbs.installDir: {
- if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos"))
- return "share/valentina/";
-
- if (qbs.targetOS.contains("macos") && !buildconfig.enableMultiBundle)
- return buildconfig.installAppPath + "/Valentina.app/Contents/Resources"
-
- return buildconfig.installDataPath + "/";
- }
- }
-
Group {
name: "Tape RC"
condition: qbs.targetOS.contains("windows")
diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp
index fe47363f8..2617b45fd 100644
--- a/src/app/valentina/core/vapplication.cpp
+++ b/src/app/valentina/core/vapplication.cpp
@@ -699,7 +699,7 @@ void VApplication::InitOptions()
QString country = VGAnalytics::CountryCode();
if (country == "ru"_L1 || country == "by"_L1)
{
- qFatal("contry not detected");
+ qFatal("country not detected");
}
});