From f9c5929144ff44045e3cf422222fd0949386a9c6 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 24 Mar 2024 16:48:54 +0100 Subject: [PATCH] refactor: Remove outdated VATSIM logo --- src/blackgui/ecosystemcombobox.cpp | 2 +- src/blackmisc/aviation/callsign.cpp | 4 +-- src/blackmisc/blackmisc.qrc | 4 --- src/blackmisc/icon.cpp | 2 -- src/blackmisc/icons.cpp | 26 ------------------ src/blackmisc/icons.h | 14 ---------- src/blackmisc/icons/vatsim/VatsimLogo16.png | Bin 862 -> 0 bytes src/blackmisc/icons/vatsim/VatsimLogo32.png | Bin 2534 -> 0 bytes .../icons/vatsim/VatsimLogoWhite16.png | Bin 819 -> 0 bytes .../icons/vatsim/VatsimLogoWhite32.png | Bin 2308 -> 0 bytes src/blackmisc/network/ecosystem.cpp | 14 ---------- src/blackmisc/network/ecosystem.h | 3 -- 12 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 src/blackmisc/icons/vatsim/VatsimLogo16.png delete mode 100644 src/blackmisc/icons/vatsim/VatsimLogo32.png delete mode 100644 src/blackmisc/icons/vatsim/VatsimLogoWhite16.png delete mode 100644 src/blackmisc/icons/vatsim/VatsimLogoWhite32.png diff --git a/src/blackgui/ecosystemcombobox.cpp b/src/blackgui/ecosystemcombobox.cpp index 595ed03f9..e33adbeb3 100644 --- a/src/blackgui/ecosystemcombobox.cpp +++ b/src/blackgui/ecosystemcombobox.cpp @@ -43,7 +43,7 @@ namespace BlackGui this->clear(); for (const CEcosystem &e : m_systems) { - this->addItem(BlackMisc::CIcon(e.toIcon()).toPixmap(), e.getSystemString()); + this->addItem(e.getSystemString()); } } } // ns diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp index d2ff17d82..5454b1099 100644 --- a/src/blackmisc/aviation/callsign.cpp +++ b/src/blackmisc/aviation/callsign.cpp @@ -127,8 +127,8 @@ namespace BlackMisc::Aviation if (QStringView(u"FSS") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleFss); } if (QStringView(u"ATIS") == sfx) { return CIcon::iconByIndex(CIcons::AviationAtis); } if (QStringView(u"EXAM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleMnt); } - if (QStringView(u"VATSIM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkVatsimLogoWhite); } - if (QStringView(u"VATGOV") == sfx) { return CIcon::iconByIndex(CIcons::NetworkVatsimLogoWhite); } + if (QStringView(u"VATSIM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); } + if (QStringView(u"VATGOV") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); } return CIcon::iconByIndex(CIcons::NetworkRoleUnknown); } diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 7e131e63e..1a2b299ee 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -136,10 +136,6 @@ icons/vatsim/S2.png icons/vatsim/S3.png icons/vatsim/SUP.png - icons/vatsim/VatsimLogo16.png - icons/vatsim/VatsimLogo32.png - icons/vatsim/VatsimLogoWhite16.png - icons/vatsim/VatsimLogoWhite32.png icons/diagona/icons/application-cloud.png diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index 99277841c..48c85b99e 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -148,8 +148,6 @@ namespace BlackMisc CIcon(CIcons::NetworkRoleSup, "supervisor"), CIcon(CIcons::NetworkRoleTower, "ATC tower"), CIcon(CIcons::NetworkRoleUnknown, "unknown"), - CIcon(CIcons::NetworkVatsimLogo, "VATSIM"), - CIcon(CIcons::NetworkVatsimLogoWhite, "VATSIM"), CIcon(CIcons::NotSet, "?"), CIcon(CIcons::OSAll, "All OS"), CIcon(CIcons::OSLinux, "Linux"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index cca9c8fed..5d02f2a2d 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -993,30 +993,6 @@ namespace BlackMisc return pm; } - const QPixmap &CIcons::vatsimLogo16() - { - static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogo16.png"); - return pm; - } - - const QPixmap &CIcons::vatsimLogo32() - { - static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogo32.png"); - return pm; - } - - const QPixmap &CIcons::vatsimLogoWhite16() - { - static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite16.png"); - return pm; - } - - const QPixmap &CIcons::vatsimLogoWhite32() - { - static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite32.png"); - return pm; - } - const QPixmap &CIcons::capabilityVoice() { static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png"); @@ -1146,8 +1122,6 @@ namespace BlackMisc case NetworkRoleSup: return roleSup(); case NetworkRoleTower: return roleTower(); case NetworkRoleUnknown: return roleUnknown(); - case NetworkVatsimLogo: return vatsimLogo16(); - case NetworkVatsimLogoWhite: return vatsimLogoWhite16(); case NotSet: return empty(); case OSAll: return osAll(); case OSLinux: return osLinux(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 32dbb80b8..a671e257f 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -84,8 +84,6 @@ namespace BlackMisc NetworkRoleSup, NetworkRoleTower, NetworkRoleUnknown, - NetworkVatsimLogo, - NetworkVatsimLogoWhite, NotSet, OSAll, OSLinux, @@ -676,18 +674,6 @@ namespace BlackMisc //! Unknown static const QPixmap &roleUnknown(); - //! VATSIM logo - static const QPixmap &vatsimLogo16(); - - //! VATSIM logo - static const QPixmap &vatsimLogo32(); - - //! VATSIM logo - static const QPixmap &vatsimLogoWhite16(); - - //! VATSIM logo - static const QPixmap &vatsimLogoWhite32(); - //! Full voice capability static const QPixmap &capabilityVoice(); diff --git a/src/blackmisc/icons/vatsim/VatsimLogo16.png b/src/blackmisc/icons/vatsim/VatsimLogo16.png deleted file mode 100644 index f0bfe32fa1419c4039fdc9f85dcb2789316f2944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 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 diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png deleted file mode 100644 index fc428253f16e474ce67792d4e2fce417cc834570..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 819 zcmV-31I+x1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2j2k~5HAikko4970013nR9JLFZ*6U5Zgc_C zX>@2HM@dakWG-a~0007dNkl1u2b!~P1*)&{gl`^zcO7JS|2cpNr=)#LAx(MkiA+Vb=!AQig4H8p}$jUO!6gAD?T~l{mcV`W^&~>TO-GkwgMPMUB`_TLO#6H(`(Msc(=#N`mNEZAoehmqQNM#M z+ZhHHnmK;t7-=0EAr^7CKcI+E5QA+f(o@ zLP%S%j3%n0L|K#b9uLOUFurh*opu|EaZY~D)KQx3WpQed){!}OCFpE*rCEBDNbTcd zV(6?Y#}V?;;hSf7$|!U3qjWZQaju|{iQaF#xnGHpO|n9y!_2|z8cFrDCIW$09zP!= zEjf##!dxz#JZkN&VA)LbYRsl-fB#7wK6_bI+`PB680oIHM9krENcVl&|00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2j2k~5H2NyH$2w>0013nR9JLFZ*6U5Zgc_C zX>@2HM@dakWG-a~000O}NkltOeIPB_EcgpDF4SxPlSU@-e&a)B^=f^x&9_EU?uVLUz2bZI(O@@j*bqS~v)SY?-7t^G_6^mv#5~m#;KJfuhKJ_>g zCr+dMP$Q46Si{hPLojrA+8Vm9VQaQ%t7%@p*TM&>Xd^}A)M-C?W?({-FDKDnt;}G)~ z45ljeF&Qo2K-XGnUPCTaN@u8~ZEYWJAeae7ffVlgIszL6eX1!H#`oB*!yhLIy3dI*iOt z60scWTs}??p8}~A!!lhQHUrFgZ3mVpVK{a=NH0g?B1_VulXs4;=U-(H(R9Mg{c~QR z)!IyDbptLv#Jrp5kmsFFUN(%#zL5+&LbQG$him%L>D45hB(_6-synk-`u2NbPL*bt zC*6@k@m}f6?5KJ|qS|0m{~r@Es%f*fa&({0l&NEhYoDWAK@!cKRPP(Wu-qbk|G;AA z$kq2_V?uupeLOc zV(wb>_&{=leo4s$(db}emY?AxVAD%S*!975CXXy+%dW?;tur(x+<1cn=@>A8AC=T_ z&%i-=42f=!mwwS!s*jzavfZXrij--mNLZ?kev$N$?@A)IS4)fioKSuvjaG_({5_Yy zz2b22&}nkUlyRzK54ANWo8J$y|Hx1>q6G{boJ~s7Gt+IbCwzvymKw6HcEZ_ywl`EW z@!mz`-*!JgUAKvjghYK0VUW)A&RCdDZ?0kI-q*;<4N#Gs&C$95{gWB^g0@6=J&zO? zv2bHC-nKCP0|`EP{aMCu{FFe!AQES432)g>%&f=C8pm}xH7vekE(@P3#xQl(+&z^? z?z!U}x(|(#DNN0B7R!jUK*1IDc49|eq#%^x0z(n;FKNU z56}FGqLJ;?)mBj#6MxV99xrRp*(i+8IHm-E@ z@P{;RnlxRiZ6i%)4K2wy?M|n}fKHZGAeAsgzzK6!KgE#dzi?-$4&7{(-3EC^9`1NM z*Nq;}KldDzEOC=;Zs6P3d|k|*ZXDf6nov4RrBrHC`VIL6`R&Rg37i(pgrB5zs#r{# zOa@#XGVqIbmTM@wr-`b###pTAJZba)i%krg*`PE;G(Z#BTlSVOP{5Yv4 zU#xcB%K!OtnB#W%`F*#ewN_(EcMF>?+B!O;3)x^1MZEoY}u@lV7>c`&V4P<8diMu7|&td#G zbsHuwfGamRlA96>>tBD1)e_~AKoB!Hh-~vLg)@@4b4v(&gSZaN;Dzn={N#qI>};;& zM0pFVZu=Gw7cCLMu(YfIZqYogrq)f@FM?l6$`x_R(bdmyWb=-L3<|a~YUFVliakUU zW7xa9j)nIuV~z9${!@MF1oQNQdqr?QE3Jd;G`trjJQbam-bzo73TKB z<@j^+u`Cw{KHABj*RA5F8?MJKF4NUeB4br=q-1xu!zFb7Ggl~O{V#p@4p=dHIeR?1~oW>Drl@s$(|wXL^+>I-!P zS95wK5}~f4kz~rGprC-D-zWN8icz@J`EuDv?kjZzKd+4=m0tdtNgetSystem()) - { - case VATSIM: return CIcons::NetworkVatsimLogo; - case Swift: return CIcons::Swift24; - case SwiftTest: return CIcons::Swift24; - case PrivateFSD: return CIcons::StandardIconAppAircraft16; - case NoSystem: return CIcons::StandardIconCrossCircle16; - case Unspecified: - default: return CIcons::StandardIconUnknown16; - } - } - QVariant CEcosystem::propertyByIndex(BlackMisc::CPropertyIndexRef index) const { if (index.isMyself()) { return QVariant::fromValue(*this); } diff --git a/src/blackmisc/network/ecosystem.h b/src/blackmisc/network/ecosystem.h index 3063b5152..e9b47b8da 100644 --- a/src/blackmisc/network/ecosystem.h +++ b/src/blackmisc/network/ecosystem.h @@ -59,9 +59,6 @@ namespace BlackMisc::Network //! Get the system string const QString &getSystemString() const; - //! \copydoc BlackMisc::Mixin::Icon::toIcon() - CIcons::IconIndex toIcon() const; - //! \copydoc BlackMisc::Mixin::Index::propertyByIndex QVariant propertyByIndex(BlackMisc::CPropertyIndexRef index) const;