diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index d55f06f92..fcef97fe3 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -388,6 +388,11 @@ icons/own/swift/swift16Database.png icons/own/swift/swiftNova64.png icons/own/swift/swift64.png + icons/own/swift/swiftCirclePilotClient1024.png + icons/own/swift/swiftCircle64.png + icons/own/swift/swiftCircle256.png + icons/own/swift/swiftCircle512.png + icons/own/swift/swiftCircle1024.png icons/qled/circle_black.svg diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 29e4975e8..f59b64694 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -169,7 +169,8 @@ namespace BlackMisc CIcon(CIcons::StandardIconWrench16, "wrench"), CIcon(CIcons::Swift16, "swift"), CIcon(CIcons::Swift24, "swift"), - CIcon(CIcons::Swift48, "swift"), + CIcon(CIcons::Swift64, "swift"), + CIcon(CIcons::Swift1024, "swift"), CIcon(CIcons::SwiftDatabase16, "swift"), CIcon(CIcons::SwiftDatabase24, "swift"), CIcon(CIcons::SwiftDatabase48, "swift"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 831a339d0..0a8d986fc 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -464,19 +464,25 @@ namespace BlackMisc const QPixmap &CIcons::swift16() { - static const QPixmap pm(swift48().scaled(16, 16)); + static const QPixmap pm(swift64().scaled(16, 16)); return pm; } const QPixmap &CIcons::swift24() { - static const QPixmap pm(":/own/icons/own/swift/swift24.png"); + static const QPixmap pm(swift64().scaled(16, 16)); return pm; } - const QPixmap &CIcons::swift48() + const QPixmap &CIcons::swift64() { - static const QPixmap pm(":/own/icons/own/swift/swift48.png"); + static const QPixmap pm(":/own/icons/own/swift/swiftCircle64.png"); + return pm; + } + + const QPixmap &CIcons::swift1024() + { + static const QPixmap pm(":/own/icons/own/swift/swiftCircle1024.png"); return pm; } @@ -1088,8 +1094,10 @@ namespace BlackMisc return swift16(); case Swift24: return swift24(); - case Swift48: - return swift48(); + case Swift64: + return swift64(); + case Swift1024: + return swift1024(); case SwiftNova16: return swiftNova16(); case SwiftNova24: diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 288e60a74..347f90133 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -162,7 +162,8 @@ namespace BlackMisc StandardIconWrench16, Swift16, Swift24, - Swift48, + Swift64, + Swift1024, SwiftDatabase16, SwiftDatabase24, SwiftDatabase48, @@ -420,7 +421,10 @@ namespace BlackMisc static const QPixmap &swift24(); //! swift icon - static const QPixmap &swift48(); + static const QPixmap &swift64(); + + //! swift icon + static const QPixmap &swift1024(); //! swift icon / database static const QPixmap &swiftDatabase16(); diff --git a/src/blackmisc/icons/own/swift/swift1bit.xcf b/src/blackmisc/icons/own/swift/swift1bit.xcf new file mode 100644 index 000000000..d756410f2 Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift1bit.xcf differ diff --git a/src/blackmisc/icons/own/swift/swiftBW.png b/src/blackmisc/icons/own/swift/swiftBW.png new file mode 100644 index 000000000..e994b931e Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftBW.png differ diff --git a/src/blackmisc/icons/own/swift/swiftBW.xcf b/src/blackmisc/icons/own/swift/swiftBW.xcf new file mode 100644 index 000000000..c419ca05a Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftBW.xcf differ diff --git a/src/blackmisc/icons/own/swift/swiftBlack.xcf b/src/blackmisc/icons/own/swift/swiftBlack.xcf new file mode 100644 index 000000000..3f76d7db8 Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftBlack.xcf differ diff --git a/src/blackmisc/icons/own/swift/swiftCircle1024.png b/src/blackmisc/icons/own/swift/swiftCircle1024.png new file mode 100644 index 000000000..d23b88f3e Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCircle1024.png differ diff --git a/src/blackmisc/icons/own/swift/swiftCircle1024.svg b/src/blackmisc/icons/own/swift/swiftCircle1024.svg new file mode 100644 index 000000000..ca4bb5b9c --- /dev/null +++ b/src/blackmisc/icons/own/swift/swiftCircle1024.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/blackmisc/icons/own/swift/swiftCircle1024.xcf b/src/blackmisc/icons/own/swift/swiftCircle1024.xcf new file mode 100644 index 000000000..2f2b5c59c Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCircle1024.xcf differ diff --git a/src/blackmisc/icons/own/swift/swiftCircle256.png b/src/blackmisc/icons/own/swift/swiftCircle256.png new file mode 100644 index 000000000..c606a5c2e Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCircle256.png differ diff --git a/src/blackmisc/icons/own/swift/swiftCircle512.png b/src/blackmisc/icons/own/swift/swiftCircle512.png new file mode 100644 index 000000000..04aafc854 Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCircle512.png differ diff --git a/src/blackmisc/icons/own/swift/swiftCircle64.png b/src/blackmisc/icons/own/swift/swiftCircle64.png new file mode 100644 index 000000000..c1bf345fe Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCircle64.png differ diff --git a/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.png b/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.png new file mode 100644 index 000000000..4c63d8394 Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.png differ diff --git a/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.xcf b/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.xcf new file mode 100644 index 000000000..fd539f216 Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftCirclePilotClient1024.xcf differ