refs #760, new 3D swift icons

* removed old icons
* new icons in CIcons class
* and as ico / icns (MAC)

src/blackmisc/blackmisc.qrc

@@ -399,33 +399,75 @@
         <file>icons/own/attitude_indicator_climbing_24.png</file>
         <file>icons/own/attitude_indicator_descend_right_turn_16.png</file>
         <file>icons/own/attitude_indicator_descend_right_turn_24.png</file>
-        <file>icons/own/swift/swift24.png</file>
-        <file>icons/own/swift/swift48.png</file>
-        <file>icons/own/swift/swiftCartoonNova24.png</file>
-        <file>icons/own/swift/swiftCartoonNova48.png</file>
         <file>icons/own/twr.jpg</file>
         <file>icons/own/transparent1px.png</file>
         <file>icons/own/arrowWide300x10down.png</file>
         <file>icons/own/arrowWide300x10up.png</file>
         <file>icons/own/gripdown42x15.png</file>
         <file>icons/own/gripup42x15.png</file>
-        <file>icons/own/swift/swift128Database.xcf</file>
-        <file>icons/own/swift/swift32Database.png</file>
-        <file>icons/own/swift/swift48Database.png</file>
-        <file>icons/own/swift/swift64Database.png</file>
-        <file>icons/own/swift/swift128Database.png</file>
-        <file>icons/own/swift/swift24Database.png</file>
-        <file>icons/own/swift/swift16Database.png</file>
-        <file>icons/own/swift/swift64.png</file>
-        <file>icons/own/swift/swiftCirclePilotClient1024.png</file>
-        <file>icons/own/swift/swiftCircle64.png</file>
-        <file>icons/own/swift/swiftCircle256.png</file>
-        <file>icons/own/swift/swiftCircle512.png</file>
-        <file>icons/own/swift/swiftCircle1024.png</file>
-        <file>icons/own/swift/swiftCartoonNova64.png</file>
         <file>icons/own/drophere24.png</file>
         <file>icons/own/drophere48.png</file>
         <file>icons/own/drophere16.png</file>
+        <file>icons/own/swift3D/sw3DBlack-16.png</file>
+        <file>icons/own/swift3D/sw3DBlack-24.png</file>
+        <file>icons/own/swift3D/sw3DBlack-32.png</file>
+        <file>icons/own/swift3D/sw3DBlack-48.png</file>
+        <file>icons/own/swift3D/sw3DBlack-64.png</file>
+        <file>icons/own/swift3D/sw3DBlack-96.png</file>
+        <file>icons/own/swift3D/sw3DBlack-128.png</file>
+        <file>icons/own/swift3D/sw3DBlack-256.png</file>
+        <file>icons/own/swift3D/sw3DBlack-512.png</file>
+        <file>icons/own/swift3D/sw3DBlack-1024.png</file>
+        <file>icons/own/swift3D/sw3DBlue-16.png</file>
+        <file>icons/own/swift3D/sw3DBlue-24.png</file>
+        <file>icons/own/swift3D/sw3DBlue-32.png</file>
+        <file>icons/own/swift3D/sw3DBlue-48.png</file>
+        <file>icons/own/swift3D/sw3DBlue-64.png</file>
+        <file>icons/own/swift3D/sw3DBlue-96.png</file>
+        <file>icons/own/swift3D/sw3DBlue-128.png</file>
+        <file>icons/own/swift3D/sw3DBlue-256.png</file>
+        <file>icons/own/swift3D/sw3DBlue-512.png</file>
+        <file>icons/own/swift3D/sw3DBlue-1024.png</file>
+        <file>icons/own/swift3D/sw3DGreen-16.png</file>
+        <file>icons/own/swift3D/sw3DGreen-24.png</file>
+        <file>icons/own/swift3D/sw3DGreen-32.png</file>
+        <file>icons/own/swift3D/sw3DGreen-48.png</file>
+        <file>icons/own/swift3D/sw3DGreen-64.png</file>
+        <file>icons/own/swift3D/sw3DGreen-96.png</file>
+        <file>icons/own/swift3D/sw3DGreen-128.png</file>
+        <file>icons/own/swift3D/sw3DGreen-256.png</file>
+        <file>icons/own/swift3D/sw3DGreen-512.png</file>
+        <file>icons/own/swift3D/sw3DGreen-1024.png</file>
+        <file>icons/own/swift3D/sw3DOrange-16.png</file>
+        <file>icons/own/swift3D/sw3DOrange-24.png</file>
+        <file>icons/own/swift3D/sw3DOrange-32.png</file>
+        <file>icons/own/swift3D/sw3DOrange-48.png</file>
+        <file>icons/own/swift3D/sw3DOrange-64.png</file>
+        <file>icons/own/swift3D/sw3DOrange-96.png</file>
+        <file>icons/own/swift3D/sw3DOrange-128.png</file>
+        <file>icons/own/swift3D/sw3DOrange-256.png</file>
+        <file>icons/own/swift3D/sw3DOrange-512.png</file>
+        <file>icons/own/swift3D/sw3DOrange-1024.png</file>
+        <file>icons/own/swift3D/sw3DRed-16.png</file>
+        <file>icons/own/swift3D/sw3DRed-24.png</file>
+        <file>icons/own/swift3D/sw3DRed-32.png</file>
+        <file>icons/own/swift3D/sw3DRed-48.png</file>
+        <file>icons/own/swift3D/sw3DRed-64.png</file>
+        <file>icons/own/swift3D/sw3DRed-96.png</file>
+        <file>icons/own/swift3D/sw3DRed-128.png</file>
+        <file>icons/own/swift3D/sw3DRed-256.png</file>
+        <file>icons/own/swift3D/sw3DRed-512.png</file>
+        <file>icons/own/swift3D/sw3DRed-1024.png</file>
+        <file>icons/own/swift3D/sw3DYellow-16.png</file>
+        <file>icons/own/swift3D/sw3DYellow-24.png</file>
+        <file>icons/own/swift3D/sw3DYellow-32.png</file>
+        <file>icons/own/swift3D/sw3DYellow-48.png</file>
+        <file>icons/own/swift3D/sw3DYellow-64.png</file>
+        <file>icons/own/swift3D/sw3DYellow-96.png</file>
+        <file>icons/own/swift3D/sw3DYellow-128.png</file>
+        <file>icons/own/swift3D/sw3DYellow-256.png</file>
+        <file>icons/own/swift3D/sw3DYellow-512.png</file>
+        <file>icons/own/swift3D/sw3DYellow-1024.png</file>
     </qresource>
     <qresource prefix="/qled">
         <file>icons/qled/circle_black.svg</file>

src/blackmisc/iconlist.cpp

@@ -180,9 +180,10 @@ namespace BlackMisc
             CIcon(CIcons::SwiftDatabase16, "swift"),
             CIcon(CIcons::SwiftDatabase24, "swift"),
             CIcon(CIcons::SwiftDatabase48, "swift"),
-            CIcon(CIcons::SwiftNova16, "swift"),
-            CIcon(CIcons::SwiftNova24, "swift"),
-            CIcon(CIcons::SwiftNova48, "swift")
+            CIcon(CIcons::SwiftDatabase1024, "swift"),
+            CIcon(CIcons::SwiftCore16, "swift"),
+            CIcon(CIcons::SwiftCore24, "swift"),
+            CIcon(CIcons::SwiftCore48, "swift")
         });
         return icons;
     }

src/blackmisc/icons.cpp

@@ -470,64 +470,173 @@ namespace BlackMisc
 
     const QPixmap &CIcons::swift16()
     {
-        static const QPixmap pm(swift64().scaled(16, 16));
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-16.png");
         return pm;
     }
 
     const QPixmap &CIcons::swift24()
     {
-        static const QPixmap pm(swift64().scaled(16, 16));
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-24.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swift48()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-48.png");
         return pm;
     }
 
     const QPixmap &CIcons::swift64()
     {
-        static const QPixmap pm(":/own/icons/own/swift/swiftCircle64.png");
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-64.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swift128()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-128.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swift256()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-256.png");
         return pm;
     }
 
     const QPixmap &CIcons::swift1024()
     {
-        static const QPixmap pm(":/own/icons/own/swift/swiftCircle1024.png");
-        return pm;
-    }
-
-    const QPixmap &CIcons::swiftNova24()
-    {
-        static const QPixmap pm(":/own/icons/own/swift/swiftCartoonNova24.png");
-        return pm;
-    }
-
-    const QPixmap &CIcons::swiftNova48()
-    {
-        static const QPixmap pm(":/own/icons/own/swift/swiftCartoonNova48.png");
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlue-1024.png");
         return pm;
     }
 
     const QPixmap &CIcons::swiftDatabase16()
     {
-        static const QPixmap pm(":/own/icons/own/swift/swiftDatabase16.png");
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-16.png");
         return pm;
     }
 
     const QPixmap &CIcons::swiftDatabase24()
     {
-        static const QPixmap pm(":/own/icons/own/swift/swiftDatabase24.png");
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-24.png");
         return pm;
     }
 
     const QPixmap &CIcons::swiftDatabase48()
     {
-        static const QPixmap pm(":/own/icons/own/swift/swiftDatabase48.png");
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-48.png");
         return pm;
     }
 
-    const QPixmap &CIcons::swiftNova16()
+    const QPixmap &CIcons::swiftDatabase64()
     {
-        static const QPixmap pm(swiftNova48().scaled(16, 16));
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-64.png");
         return pm;
     }
 
+    const QPixmap &CIcons::swiftDatabase128()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-128.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftDatabase256()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-256.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftDatabase1024()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DGreen-1024.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore16()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-16.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore24()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-24.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore48()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-48.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore64()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-64.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore128()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-128.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore256()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-256.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftCore1024()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DOrange-1024.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher16()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-16.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher24()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-24.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher48()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-48.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher64()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-64.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher128()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-128.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher256()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-256.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::swiftLauncher1024()
+    {
+        static const QPixmap pm(":/own/icons/own/swift3D/sw3DBlack-1024.png");
+        return pm;
+    }
+
+
     const QPixmap &CIcons::appWeather16()
     {
         return weatherCloudy16();
@@ -1100,22 +1209,58 @@ namespace BlackMisc
             return swift16();
         case Swift24:
             return swift24();
+        case Swift48:
+            return swift48();
         case Swift64:
             return swift64();
+        case Swift128:
+            return swift128();
+        case Swift256:
+            return swift256();
         case Swift1024:
             return swift1024();
-        case SwiftNova16:
-            return swiftNova16();
-        case SwiftNova24:
-            return swiftNova24();
-        case SwiftNova48:
-            return swiftNova48();
+        case SwiftCore16:
+            return swiftCore16();
+        case SwiftCore24:
+            return swiftCore24();
+        case SwiftCore48:
+            return swiftCore48();
+        case SwiftCore64:
+            return swiftCore64();
+        case SwiftCore128:
+            return swiftCore128();
+        case SwiftCore256:
+            return swiftCore256();
+        case SwiftCore1024:
+            return swiftCore1024();
         case SwiftDatabase16:
             return swiftDatabase16();
         case SwiftDatabase24:
             return swiftDatabase24();
         case SwiftDatabase48:
             return swiftDatabase48();
+        case SwiftDatabase64:
+            return swiftDatabase64();
+        case SwiftDatabase128:
+            return swiftDatabase128();
+        case SwiftDatabase256:
+            return swiftDatabase256();
+        case SwiftDatabase1024:
+            return swiftDatabase1024();
+        case SwiftLauncher16:
+            return swiftLauncher16();
+        case SwiftLauncher24:
+            return swiftLauncher24();
+        case SwiftLauncher48:
+            return swiftLauncher48();
+        case SwiftLauncher64:
+            return swiftLauncher64();
+        case SwiftLauncher128:
+            return swiftLauncher128();
+        case SwiftLauncher256:
+            return swiftLauncher256();
+        case SwiftLauncher1024:
+            return swiftLauncher1024();
         default:
             return empty();
         }

src/blackmisc/icons.h

@@ -170,14 +170,35 @@ namespace BlackMisc
             StandardIconWrench16,
             Swift16,
             Swift24,
+            Swift48,
             Swift64,
+            Swift128,
+            Swift256,
             Swift1024,
             SwiftDatabase16,
             SwiftDatabase24,
             SwiftDatabase48,
-            SwiftNova16,
-            SwiftNova24,
-            SwiftNova48,
+            SwiftDatabase64,
+            SwiftDatabase128,
+            SwiftDatabase256,
+            SwiftDatabase1024,
+            SwiftCore16,
+            SwiftCore24,
+            SwiftCore48,
+            SwiftCore64,
+            SwiftCore128,
+            SwiftCore256,
+            SwiftCore512,
+            SwiftCore1024,
+            SwiftLauncher16,
+            SwiftLauncher24,
+            SwiftLauncher48,
+            SwiftLauncher64,
+            SwiftLauncher128,
+            SwiftLauncher256,
+            SwiftLauncher512,
+            SwiftLauncher1024,
+
 
             // ---------------------------
             // Icon is not from resources, but generated at runtime
@@ -423,34 +444,37 @@ namespace BlackMisc
         // --------------------------------------------------
 
         //! swift icon
+        //! @{
         static const QPixmap &swift16();
-
-        //! swift icon
         static const QPixmap &swift24();
-
-        //! swift icon
+        static const QPixmap &swift48();
         static const QPixmap &swift64();
-
-        //! swift icon
+        static const QPixmap &swift128();
+        static const QPixmap &swift256();
         static const QPixmap &swift1024();
-
-        //! swift icon / database
         static const QPixmap &swiftDatabase16();
-
-        //! swift icon / database
         static const QPixmap &swiftDatabase24();
-
-        //! swift icon / database
         static const QPixmap &swiftDatabase48();
+        static const QPixmap &swiftDatabase64();
+        static const QPixmap &swiftDatabase128();
+        static const QPixmap &swiftDatabase256();
+        static const QPixmap &swiftDatabase1024();
+        static const QPixmap &swiftCore16();
+        static const QPixmap &swiftCore24();
+        static const QPixmap &swiftCore48();
+        static const QPixmap &swiftCore64();
+        static const QPixmap &swiftCore128();
+        static const QPixmap &swiftCore256();
+        static const QPixmap &swiftCore1024();
+        static const QPixmap &swiftLauncher16();
+        static const QPixmap &swiftLauncher24();
+        static const QPixmap &swiftLauncher48();
+        static const QPixmap &swiftLauncher64();
+        static const QPixmap &swiftLauncher128();
+        static const QPixmap &swiftLauncher256();
+        static const QPixmap &swiftLauncher1024();
 
-        //! swift icon (nova)
-        static const QPixmap &swiftNova16();
-
-        //! swift icon (nova)
-        static const QPixmap &swiftNova24();
-
-        //! swift icon (nova)
-        static const QPixmap &swiftNova48();
+        //! @}
 
         // --------------------------------------------------
         // -- application icons