From 8d37d24e21d95f3f7fd2c3bf170e5bcf47a07f89 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 23 Jan 2015 01:58:29 +0100 Subject: [PATCH] New icons (for callsign) --- src/blackmisc/avcallsign.cpp | 4 +++- src/blackmisc/blackmisc.qrc | 2 ++ src/blackmisc/iconlist.cpp | 2 ++ src/blackmisc/icons.cpp | 19 +++++++++++++++++++ src/blackmisc/icons.h | 11 +++++++++++ src/blackmisc/icons/vatsim/VatsimLogo16.png | Bin 0 -> 862 bytes src/blackmisc/icons/vatsim/VatsimLogo32.png | Bin 0 -> 2534 bytes 7 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/blackmisc/icons/vatsim/VatsimLogo16.png create mode 100644 src/blackmisc/icons/vatsim/VatsimLogo32.png diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index d06127f14..dd4fe6d77 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -60,8 +60,10 @@ namespace BlackMisc if ("CTR" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleCenter); } if ("SUP" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleSup); } if ("OBS" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleObs); } + if ("FSS" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleFss); } if ("ATIS" == sfx) { return CIconList::iconByIndex(CIcons::AviationAtis); } - if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleMnt); } + if ("EXAM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleMnt); } + if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkVatsimLogo); } return CIconList::iconByIndex(CIcons::NetworkRoleUnknown); } diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 80b893090..b4a10cec3 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -83,6 +83,8 @@ icons/vatsim/S2.png icons/vatsim/S3.png icons/vatsim/SUP.png + icons/vatsim/VatsimLogo16.png + icons/vatsim/VatsimLogo32.png icons/diagona/icons/application-cloud.png diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 11786aba3..7c7ed5597 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -62,6 +62,7 @@ namespace BlackMisc CIcon(CIcons::NetworkRoleC3, "C3"), CIcon(CIcons::NetworkRoleCenter, "ATC center"), CIcon(CIcons::NetworkRoleDelivery, "ATC delivery"), + CIcon(CIcons::NetworkRoleFss, "FSS"), CIcon(CIcons::NetworkRoleGround, "ATC ground"), CIcon(CIcons::NetworkRoleI1, "I1 (instructor)"), CIcon(CIcons::NetworkRoleI3, "I3 (instructor)"), @@ -74,6 +75,7 @@ namespace BlackMisc CIcon(CIcons::NetworkRoleSup, "supervisor"), CIcon(CIcons::NetworkRoleTower, "ATC tower"), CIcon(CIcons::NetworkRoleUnknown, "unknown"), + CIcon(CIcons::NetworkVatsimLogo, "VATSIM"), CIcon(CIcons::NotSet, "?"), CIcon(CIcons::StandardIconAppAircrafts16, "aircrafts"), CIcon(CIcons::StandardIconAppAtc16, "ATC"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 886adc6ed..214249902 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -428,6 +428,11 @@ namespace BlackMisc return pm; } + const QPixmap &CIcons::roleFss() + { + return info16(); + } + const QPixmap &CIcons::roleTower() { static const QPixmap pm(QPixmap(":/own/icons/own/twr.jpg").scaledToWidth(16, Qt::SmoothTransformation)); @@ -446,6 +451,18 @@ 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::capabilityVoice() { static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png"); @@ -506,6 +523,7 @@ namespace BlackMisc case NetworkRoleC3: return roleC3(); case NetworkRoleCenter: return roleCenter(); case NetworkRoleDelivery: return roleDelivery(); + case NetworkRoleFss: return roleFss(); case NetworkRoleGround: return roleGround(); case NetworkRoleI1: return roleI1(); case NetworkRoleI3: return roleI3(); @@ -518,6 +536,7 @@ namespace BlackMisc case NetworkRoleSup: return roleSup(); case NetworkRoleTower: return roleTower(); case NetworkRoleUnknown: return roleUnknown(); + case NetworkVatsimLogo: return vatsimLogo16(); case NotSet: return empty(); case StandardIconAppAircrafts16: return appAircrafts16(); case StandardIconAppAtc16: return appAtc16(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index ced108e55..78663430d 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -54,6 +54,7 @@ namespace BlackMisc NetworkRoleC3, NetworkRoleCenter, NetworkRoleDelivery, + NetworkRoleFss, NetworkRoleGround, NetworkRoleI1, NetworkRoleI3, @@ -66,6 +67,7 @@ namespace BlackMisc NetworkRoleSup, NetworkRoleTower, NetworkRoleUnknown, + NetworkVatsimLogo, NotSet, StandardIconAppAircrafts16, StandardIconAppAtc16, @@ -442,6 +444,9 @@ namespace BlackMisc //! Delivery static const QPixmap &roleDelivery(); + //! FSS (flight service staion) + static const QPixmap &roleFss(); + //! Tower static const QPixmap &roleTower(); @@ -451,6 +456,12 @@ namespace BlackMisc //! Unknown static const QPixmap &roleUnknown(); + //! VATSIM logo + static const QPixmap &vatsimLogo16(); + + //! VATSIM logo + static const QPixmap &vatsimLogo32(); + //! Full voice capability static const QPixmap &capabilityVoice(); diff --git a/src/blackmisc/icons/vatsim/VatsimLogo16.png b/src/blackmisc/icons/vatsim/VatsimLogo16.png new file mode 100644 index 0000000000000000000000000000000000000000..f0bfe32fa1419c4039fdc9f85dcb2789316f2944 GIT binary patch literal 862 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 literal 0 HcmV?d00001