diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp index 2382a0035..efbe92ee8 100644 --- a/src/blackmisc/aviation/callsign.cpp +++ b/src/blackmisc/aviation/callsign.cpp @@ -86,18 +86,19 @@ namespace BlackMisc { if (suffix.length() < 3) { return CIcon::iconByIndex(CIcons::NetworkRoleUnknown); } const QString sfx = suffix.toUpper(); - if ("APP" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleApproach); } - if ("GND" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleGround); } - if ("TWR" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleTower); } - if ("DEL" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleDelivery); } - if ("CTR" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleCenter); } - if ("SUP" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); } - if ("OBS" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleObs); } - if ("INS" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleMnt); } - if ("FSS" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleFss); } - if ("ATIS" == sfx) { return CIcon::iconByIndex(CIcons::AviationAtis); } - if ("EXAM" == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleMnt); } - if ("VATSIM" == sfx) { return CIcon::iconByIndex(CIcons::NetworkVatsimLogoWhite); } + if (QStringView(u"APP") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleApproach); } + if (QStringView(u"DEP") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleDeparture); } + if (QStringView(u"GND") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleGround); } + if (QStringView(u"TWR") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleTower); } + if (QStringView(u"DEL") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleDelivery); } + if (QStringView(u"CTR") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleCenter); } + if (QStringView(u"SUP") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); } + if (QStringView(u"OBS") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleObs); } + if (QStringView(u"INS") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleMnt); } + 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); } return CIcon::iconByIndex(CIcons::NetworkRoleUnknown); } diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index e3ae1e6a1..450df6803 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -79,6 +79,7 @@ namespace BlackMisc CIcon(CIcons::NetworkRoleC3, "C3"), CIcon(CIcons::NetworkRoleCenter, "ATC center"), CIcon(CIcons::NetworkRoleDelivery, "ATC delivery"), + CIcon(CIcons::NetworkRoleDeparture, "ATC departure"), CIcon(CIcons::NetworkRoleFss, "FSS"), CIcon(CIcons::NetworkRoleGround, "ATC ground"), CIcon(CIcons::NetworkRoleI1, "I1 (instructor)"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 3e9084d8e..4463678fb 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -1010,6 +1010,13 @@ namespace BlackMisc return pm; } + const QPixmap &CIcons::roleDeparture() + { + // currently same icons as APP + static const QPixmap pm(QPixmap(":/own/icons/own/app.jpg").scaledToWidth(16, Qt::SmoothTransformation)); + return pm; + } + const QPixmap &CIcons::roleFss() { return info16(); @@ -1165,13 +1172,14 @@ namespace BlackMisc case NetworkCapabilityUnknown: return capabilityUnknown(); case NetworkCapabilityVoice: return capabilityVoice(); case NetworkCapabilityVoiceBackground: return capabilityVoiceBackground(); - case NetworkCapabilityVoiceReceiveOnly: return capabilityVoiceReceiveOnly(); + case NetworkCapabilityVoiceReceiveOnly: return capabilityVoiceReceiveOnly(); case NetworkCapabilityVoiceReceiveOnlyBackground: return capabilityVoiceReceiveOnlyBackground(); case NetworkRoleApproach: return roleApproach(); case NetworkRoleC1: return roleC1(); case NetworkRoleC3: return roleC3(); case NetworkRoleCenter: return roleCenter(); case NetworkRoleDelivery: return roleDelivery(); + case NetworkRoleDeparture: return roleDeparture(); case NetworkRoleFss: return roleFss(); case NetworkRoleGround: return roleGround(); case NetworkRoleI1: return roleI1(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index c10284ec4..038016571 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -74,6 +74,7 @@ namespace BlackMisc NetworkRoleC3, NetworkRoleCenter, NetworkRoleDelivery, + NetworkRoleDeparture, NetworkRoleFss, NetworkRoleGround, NetworkRoleI1, @@ -692,6 +693,9 @@ namespace BlackMisc //! Delivery static const QPixmap &roleDelivery(); + //! Departure + static const QPixmap &roleDeparture(); + //! FSS (flight service staion) static const QPixmap &roleFss();