diff --git a/src/blackgui/components/configsimulatorcomponent.cpp b/src/blackgui/components/configsimulatorcomponent.cpp index 6e750f290..c1fc2dd67 100644 --- a/src/blackgui/components/configsimulatorcomponent.cpp +++ b/src/blackgui/components/configsimulatorcomponent.cpp @@ -77,15 +77,6 @@ namespace BlackGui::Components CGuiUtility::checkBoxReadOnly(ui->cb_XP, !CBuildConfig::isCompiledWithXPlaneSupport()); CGuiUtility::checkBoxReadOnly(ui->cb_FG, !CBuildConfig::isCompiledWithFGSupport()); - /** does NOT work - const qreal fadeOut = 0.25; - ui->lbl_P3D->setWindowOpacity(CBuildConfig::isCompiledWithP3DSupport() ? 1.0 : fadeOut); - ui->lbl_FSX->setWindowOpacity(CBuildConfig::isCompiledWithFsxSupport() ? 1.0 : fadeOut); - ui->lbl_FS9->setWindowOpacity(CBuildConfig::isCompiledWithFs9Support() ? 1.0 : fadeOut); - ui->lbl_XP->setWindowOpacity(CBuildConfig::isCompiledWithXPlaneSupport() ? 1.0 : fadeOut); - ui->lbl_FG->setWindowOpacity(CBuildConfig::isCompiledWithFGSupport() ? 1.0 : fadeOut); - **/ - if (p3d) { ui->comp_SettingsSimulator->setSimulator(CSimulatorInfo(CSimulatorInfo::P3D)); } else if (fsx) { ui->comp_SettingsSimulator->setSimulator(CSimulatorInfo(CSimulatorInfo::FSX)); } else if (fs9) { ui->comp_SettingsSimulator->setSimulator(CSimulatorInfo(CSimulatorInfo::FS9)); } diff --git a/src/blackgui/components/configsimulatorcomponent.ui b/src/blackgui/components/configsimulatorcomponent.ui index ee1a7ec83..aae22d5c2 100644 --- a/src/blackgui/components/configsimulatorcomponent.ui +++ b/src/blackgui/components/configsimulatorcomponent.ui @@ -51,16 +51,6 @@ - - - - background: "lightgrey" - - - <img width="100" src=":/simulators/icons/simulators/FS9.png"/> - - - @@ -75,16 +65,6 @@ - - - - background: "lightgrey" - - - <img width="100" src=":/simulators/icons/simulators/FSX.png"/> - - - @@ -98,33 +78,6 @@ - - - - background: "lightgrey" - - - <img width="100" src=":/simulators/icons/simulators/XPlane.png"/> - - - - - - - background: "lightgrey" - - - <img width="130" src=":/simulators/icons/simulators/Prepar3D.png"/> - - - - - - - <img width="50" src=":/simulators/icons/simulators/FG.png"/> - - - diff --git a/src/blackgui/components/installfsxterrainprobecomponent.ui b/src/blackgui/components/installfsxterrainprobecomponent.ui index 228905b47..ed28a5f40 100644 --- a/src/blackgui/components/installfsxterrainprobecomponent.ui +++ b/src/blackgui/components/installfsxterrainprobecomponent.ui @@ -20,26 +20,6 @@ - - - - background: "lightgrey" - - - <img width="100" src=":/simulators/icons/simulators/FSX.png"/> - - - - - - - background: "lightgrey" - - - <img width="130" src=":/simulators/icons/simulators/Prepar3D.png"/> - - - diff --git a/src/blackgui/components/installxswiftbuscomponent.ui b/src/blackgui/components/installxswiftbuscomponent.ui index e57cce228..c20036664 100644 --- a/src/blackgui/components/installxswiftbuscomponent.ui +++ b/src/blackgui/components/installxswiftbuscomponent.ui @@ -32,13 +32,6 @@ 6 - - - - <html><img src=":/simulators/icons/simulators/XPlane.png" width=175></html> - - - diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 12e4c00fb..7e131e63e 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -579,13 +579,6 @@ icons/misc/cn.png icons/misc/ru.png - - icons/simulators/FS9.png - icons/simulators/FSX.png - icons/simulators/Prepar3D.png - icons/simulators/XPlane.png - icons/simulators/FG.png - icons/famfamfam/icons/silk/control_eject.png icons/famfamfam/icons/silk/control_eject_blue.png diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index dd402a72e..99277841c 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -155,16 +155,6 @@ namespace BlackMisc CIcon(CIcons::OSLinux, "Linux"), CIcon(CIcons::OSMacOs, "Mac OS"), CIcon(CIcons::OSWindows, "Windows"), - CIcon(CIcons::SimulatorFG, "FG"), - CIcon(CIcons::SimulatorFG16, "FG"), - CIcon(CIcons::SimulatorFS9, "FS9"), - CIcon(CIcons::SimulatorFS916, "FS9"), - CIcon(CIcons::SimulatorFSX, "FSX"), - CIcon(CIcons::SimulatorFSX16, "FSX"), - CIcon(CIcons::SimulatorP3D, "P3D"), - CIcon(CIcons::SimulatorP3D16, "P3D"), - CIcon(CIcons::SimulatorXPlane, "XPlane"), - CIcon(CIcons::SimulatorXPlane16, "XPlane"), CIcon(CIcons::StandardIconAppAircraft16, "aircraft"), CIcon(CIcons::StandardIconAppAtc16, "ATC"), CIcon(CIcons::StandardIconAppFlightPlan16, "flight plan"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 4aa6cd363..e1c2f126e 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -537,66 +537,6 @@ namespace BlackMisc return pm; } - const QPixmap &CIcons::simulatorFSX() - { - static const QPixmap pm(":/simulators/icons/simulators/FSX.png"); - return pm; - } - - const QPixmap &CIcons::simulatorFSX16() - { - static const QPixmap pm(simulatorFSX().scaled(32, 16, Qt::KeepAspectRatio)); - return pm; - } - - const QPixmap &CIcons::simulatorP3D() - { - static const QPixmap pm(":/simulators/icons/simulators/Prepar3D.png"); - return pm; - } - - const QPixmap &CIcons::simulatorP3D16() - { - static const QPixmap pm(simulatorP3D().scaled(32, 16, Qt::KeepAspectRatio)); - return pm; - } - - const QPixmap &CIcons::simulatorFS9() - { - static const QPixmap pm(":/simulators/icons/simulators/FS9.png"); - return pm; - } - - const QPixmap &CIcons::simulatorFS916() - { - static const QPixmap pm(simulatorFS9().scaled(32, 16, Qt::KeepAspectRatio)); - return pm; - } - - const QPixmap &CIcons::simulatorFG() - { - static const QPixmap pm(":/simulators/icons/simulators/FG.png"); - return pm; - } - - const QPixmap &CIcons::simulatorFG16() - { - static const QPixmap pm(simulatorFG().scaled(32, 16, Qt::KeepAspectRatio)); - return pm; - } - - const QPixmap &CIcons::simulatorXPlane() - { - static const QPixmap pm(":/simulators/icons/simulators/FS9.png"); - return pm; - } - - const QPixmap &CIcons::simulatorXPlane16() - { - static const QPixmap pm(simulatorXPlane().scaled(32, 16, Qt::KeepAspectRatio)); - return pm; - } - const QPixmap &CIcons::swift16() { static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-16.png"); @@ -1213,16 +1153,6 @@ namespace BlackMisc case OSLinux: return osLinux(); case OSMacOs: return osMac(); case OSWindows: return osWindows(); - case SimulatorFG: return simulatorFG(); - case SimulatorFG16: return simulatorFG16(); - case SimulatorFS9: return simulatorFS9(); - case SimulatorFS916: return simulatorFS916(); - case SimulatorFSX: return simulatorFSX(); - case SimulatorFSX16: return simulatorFSX16(); - case SimulatorP3D: return simulatorP3D(); - case SimulatorP3D16: return simulatorP3D16(); - case SimulatorXPlane: return simulatorXPlane(); - case SimulatorXPlane16: return simulatorXPlane16(); case StandardIconAppAircraft16: return appAircraft16(); case StandardIconAppAtc16: return appAtc16(); case StandardIconAppFlightPlan16: return appFlightPlan16(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index a7e0bcc0a..32dbb80b8 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -91,16 +91,6 @@ namespace BlackMisc OSLinux, OSMacOs, OSWindows, - SimulatorFG, - SimulatorFG16, - SimulatorFS9, - SimulatorFS916, - SimulatorFSX, - SimulatorFSX16, - SimulatorP3D, - SimulatorP3D16, - SimulatorXPlane, - SimulatorXPlane16, StandardIconAppAircraft16, StandardIconAppAtc16, StandardIconAppFlightPlan16, @@ -499,40 +489,6 @@ namespace BlackMisc //! Preloader static const QPixmap &preloader16(); - // -------------------------------------------------- - // -- Simulators - // -------------------------------------------------- - - //! @{ - //! Simulator FSX - static const QPixmap &simulatorFSX(); - static const QPixmap &simulatorFSX16(); - //! @} - - //! @{ - //! Simulator P3D - static const QPixmap &simulatorP3D(); - static const QPixmap &simulatorP3D16(); - //! @} - - //! @{ - //! Simulator FS9 - static const QPixmap &simulatorFS9(); - static const QPixmap &simulatorFS916(); - //! @} - - //! @{ - //! Simulator FG - static const QPixmap &simulatorFG(); - static const QPixmap &simulatorFG16(); - //! @} - - //! @{ - //! Simulator XPlane - static const QPixmap &simulatorXPlane(); - static const QPixmap &simulatorXPlane16(); - //! @} - // -------------------------------------------------- // -- swift // -------------------------------------------------- diff --git a/src/blackmisc/icons/simulators/FG.png b/src/blackmisc/icons/simulators/FG.png deleted file mode 100644 index 2df4c4416..000000000 Binary files a/src/blackmisc/icons/simulators/FG.png and /dev/null differ diff --git a/src/blackmisc/icons/simulators/FS9.png b/src/blackmisc/icons/simulators/FS9.png deleted file mode 100644 index fc086e315..000000000 Binary files a/src/blackmisc/icons/simulators/FS9.png and /dev/null differ diff --git a/src/blackmisc/icons/simulators/FSX.png b/src/blackmisc/icons/simulators/FSX.png deleted file mode 100644 index f8db742b4..000000000 Binary files a/src/blackmisc/icons/simulators/FSX.png and /dev/null differ diff --git a/src/blackmisc/icons/simulators/Prepar3D.png b/src/blackmisc/icons/simulators/Prepar3D.png deleted file mode 100644 index d5f2aedc3..000000000 Binary files a/src/blackmisc/icons/simulators/Prepar3D.png and /dev/null differ diff --git a/src/blackmisc/icons/simulators/XPlane.png b/src/blackmisc/icons/simulators/XPlane.png deleted file mode 100644 index 784dfd3d6..000000000 Binary files a/src/blackmisc/icons/simulators/XPlane.png and /dev/null differ diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 5545dd858..f5da9ad5b 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -168,19 +168,7 @@ namespace BlackMisc::Simulation CIcons::IconIndex CSimulatorInfo::toIcon() const { - if (this->isSingleSimulator()) - { - switch (this->getSimulator()) - { - case FSX: return CIcons::SimulatorFSX16; - case FS9: return CIcons::SimulatorFS916; - case P3D: return CIcons::SimulatorP3D16; - case XPLANE: return CIcons::SimulatorXPlane16; - case FG: return CIcons::SimulatorXPlane16; - default: break; - } - } - return CValueObject::toIcon(); + return CIcons::StandardIconEmpty; } CSimulatorInfo CSimulatorInfo::add(const CSimulatorInfo &other)