New icons (for callsign)

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);
         }
 

src/blackmisc/blackmisc.qrc

@@ -83,6 +83,8 @@
         <file>icons/vatsim/S2.png</file>
         <file>icons/vatsim/S3.png</file>
         <file>icons/vatsim/SUP.png</file>
+        <file>icons/vatsim/VatsimLogo16.png</file>
+        <file>icons/vatsim/VatsimLogo32.png</file>
     </qresource>
     <qresource prefix="/diagona">
         <file>icons/diagona/icons/application-cloud.png</file>

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"),

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();

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();