diff --git a/resources/share/legal/background.jpeg b/resources/share/legal/background.jpeg
deleted file mode 100644
index d5212c8d0..000000000
Binary files a/resources/share/legal/background.jpeg and /dev/null differ
diff --git a/resources/share/legal/style.css b/resources/share/legal/style.css
index a72356f68..d59335a23 100644
--- a/resources/share/legal/style.css
+++ b/resources/share/legal/style.css
@@ -53,7 +53,6 @@ th {
div.swifttoc table {
border-spacing: 0.6em;
- background-image: url(background.jpeg) ;
background-size: 100% auto;
border-radius: 15px;
}
diff --git a/src/gui/components/altitudedialog.ui b/src/gui/components/altitudedialog.ui
index 81903e380..5a2cdceb2 100644
--- a/src/gui/components/altitudedialog.ui
+++ b/src/gui/components/altitudedialog.ui
@@ -180,13 +180,6 @@
- -
-
-
- <html><head/><body><p><img src="qrc:/misc/icons/misc/cn.png"/><img src="qrc:/misc/icons/misc/ru.png"/></p></body></html>
-
-
-
diff --git a/src/misc/icon.cpp b/src/misc/icon.cpp
index d62467cc3..5d2051579 100644
--- a/src/misc/icon.cpp
+++ b/src/misc/icon.cpp
@@ -128,10 +128,6 @@ namespace swift::misc
CIcon(CIcons::NetworkRoleTower, "ATC tower"),
CIcon(CIcons::NetworkRoleUnknown, "unknown"),
CIcon(CIcons::NotSet, "?"),
- CIcon(CIcons::OSAll, "All OS"),
- CIcon(CIcons::OSLinux, "Linux"),
- CIcon(CIcons::OSMacOs, "Mac OS"),
- CIcon(CIcons::OSWindows, "Windows"),
CIcon(CIcons::StandardIconAppAircraft16, "aircraft"),
CIcon(CIcons::StandardIconAppAtc16, "ATC"),
CIcon(CIcons::StandardIconAppFlightPlan16, "flight plan"),
diff --git a/src/misc/icons.cpp b/src/misc/icons.cpp
index 7742419b2..573e1220b 100644
--- a/src/misc/icons.cpp
+++ b/src/misc/icons.cpp
@@ -488,26 +488,6 @@ namespace swift::misc
return pm;
}
- const QPixmap &CIcons::osAll() { return empty16(); }
-
- const QPixmap &CIcons::osLinux()
- {
- static const QPixmap pm(":/os/icons/os/linux_24.png");
- return pm;
- }
-
- const QPixmap &CIcons::osMac()
- {
- static const QPixmap pm(":/os/icons/os/macos_24.png");
- return pm;
- }
-
- const QPixmap &CIcons::osWindows()
- {
- static const QPixmap pm(":/os/icons/os/windows_24.png");
- return pm;
- }
-
const QPixmap &CIcons::swift16()
{
static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-16.png");
@@ -996,10 +976,6 @@ namespace swift::misc
case NetworkRoleTower: return roleTower();
case NetworkRoleUnknown: return roleUnknown();
case NotSet: return empty();
- case OSAll: return osAll();
- case OSLinux: return osLinux();
- case OSMacOs: return osMac();
- case OSWindows: return osWindows();
case StandardIconAppAircraft16: return appAircraft16();
case StandardIconAppAtc16: return appAtc16();
case StandardIconAppFlightPlan16: return appFlightPlan16();
diff --git a/src/misc/icons.h b/src/misc/icons.h
index db159edc1..256a74003 100644
--- a/src/misc/icons.h
+++ b/src/misc/icons.h
@@ -85,10 +85,6 @@ namespace swift::misc
NetworkRoleTower,
NetworkRoleUnknown,
NotSet,
- OSAll,
- OSLinux,
- OSMacOs,
- OSWindows,
StandardIconAppAircraft16,
StandardIconAppAtc16,
StandardIconAppFlightPlan16,
@@ -458,22 +454,6 @@ namespace swift::misc
//! Database table
static const QPixmap &databaseTable16();
- // --------------------------------------------------
- // -- OS icons
- // --------------------------------------------------
-
- //! All OS
- static const QPixmap &osAll();
-
- //! Linux
- static const QPixmap &osLinux();
-
- //! MacOS
- static const QPixmap &osMac();
-
- //! Windows
- static const QPixmap &osWindows();
-
// --------------------------------------------------
// -- swift
// --------------------------------------------------
diff --git a/src/misc/icons/misc/cn.png b/src/misc/icons/misc/cn.png
deleted file mode 100644
index 4836b0fe3..000000000
Binary files a/src/misc/icons/misc/cn.png and /dev/null differ
diff --git a/src/misc/icons/misc/ru.png b/src/misc/icons/misc/ru.png
deleted file mode 100644
index ca1a08755..000000000
Binary files a/src/misc/icons/misc/ru.png and /dev/null differ
diff --git a/src/misc/icons/misc/toolWizard128.png b/src/misc/icons/misc/toolWizard128.png
deleted file mode 100644
index 302f929a9..000000000
Binary files a/src/misc/icons/misc/toolWizard128.png and /dev/null differ
diff --git a/src/misc/icons/misc/toolWizard64.png b/src/misc/icons/misc/toolWizard64.png
deleted file mode 100644
index 2c3858dfc..000000000
Binary files a/src/misc/icons/misc/toolWizard64.png and /dev/null differ
diff --git a/src/misc/icons/os/linux_24.png b/src/misc/icons/os/linux_24.png
deleted file mode 100644
index e014dc89a..000000000
Binary files a/src/misc/icons/os/linux_24.png and /dev/null differ
diff --git a/src/misc/icons/os/macos_24.png b/src/misc/icons/os/macos_24.png
deleted file mode 100644
index 058f0ae93..000000000
Binary files a/src/misc/icons/os/macos_24.png and /dev/null differ
diff --git a/src/misc/icons/os/windows_24.png b/src/misc/icons/os/windows_24.png
deleted file mode 100644
index cee194d1f..000000000
Binary files a/src/misc/icons/os/windows_24.png and /dev/null differ
diff --git a/src/misc/misc.qrc b/src/misc/misc.qrc
index e9e854215..ab0a193d0 100644
--- a/src/misc/misc.qrc
+++ b/src/misc/misc.qrc
@@ -552,15 +552,4 @@
icons/textures/texture-inner.jpg
icons/textures/texture-outer.jpg
-
- icons/misc/toolWizard64.png
- icons/misc/toolWizard128.png
- icons/misc/cn.png
- icons/misc/ru.png
-
-
- icons/os/linux_24.png
- icons/os/macos_24.png
- icons/os/windows_24.png
-
diff --git a/src/misc/platform.cpp b/src/misc/platform.cpp
index d787da853..5851272f5 100644
--- a/src/misc/platform.cpp
+++ b/src/misc/platform.cpp
@@ -52,19 +52,7 @@ namespace swift::misc
QString CPlatform::getPlatformName() const { return this->convertToQString(true); }
- CIcons::IconIndex CPlatform::toIcon() const
- {
- if (this->getPlatform() == All) { return CIcons::OSAll; }
- switch (this->getPlatformFlag())
- {
- case Win32:
- case Win64: return CIcons::OSWindows;
- case Linux: return CIcons::OSLinux;
- case MacOS: return CIcons::OSMacOs;
- default: break;
- }
- return CIcons::StandardIconEmpty;
- }
+ CIcons::IconIndex CPlatform::toIcon() const { return CIcons::StandardIconEmpty; }
QString CPlatform::convertToQString(bool i18n) const
{
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index f845826f1..7bd483596 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -670,11 +670,7 @@
-
- ...
-
-
-
- :/misc/icons/misc/toolWizard128.png:/misc/icons/misc/toolWizard128.png
+ Config