diff --git a/src/blackgui/models/clientlistmodel.cpp b/src/blackgui/models/clientlistmodel.cpp index 9f520f44a..fa67e81d7 100644 --- a/src/blackgui/models/clientlistmodel.cpp +++ b/src/blackgui/models/clientlistmodel.cpp @@ -33,7 +33,7 @@ namespace BlackGui this->m_columns.addColumn(CColumn::standardString("capabilities", CClient::IndexCapabilitiesString)); this->m_columns.addColumn(CColumn::standardString("model", {CClient::IndexModel, CAircraftModel::IndexModelString})); this->m_columns.addColumn(CColumn("q.?", "queried", {CClient::IndexModel, CAircraftModel::IndexIsQueriedModelString}, - new CBoolIconFormatter(CIcons::StandardIconTick, CIcons::StandardIconCross, "queried", "not queried"))); + new CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconCross16, "queried", "not queried"))); this->m_columns.addColumn(CColumn::standardString("server", CClient::IndexServer)); // force strings for translation in resource files diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp index bcee7b15b..bfaf3c16d 100644 --- a/src/blackgui/models/columnformatters.cpp +++ b/src/blackgui/models/columnformatters.cpp @@ -273,7 +273,7 @@ namespace BlackGui } CBoolIconFormatter::CBoolIconFormatter(int alignment) : - CBoolIconFormatter(CIcons::StandardIconTick, CIcons::StandardIconEmpty16, "on", "off", alignment) + CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconEmpty16, "on", "off", alignment) { } CBoolIconFormatter::CBoolIconFormatter(CIcons::IconIndex onIcon, CIcons::IconIndex offIcon, const QString &onName, const QString &offName, int alignment) : diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 6085793b0..f6560b772 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -287,6 +287,23 @@ icons/diagona/icons/binocular--arrow.png icons/diagona/icons/binocular--exclamation.png icons/diagona/icons/binocular--minus.png + icons/diagona/icons/arrow-circle.png + icons/diagona/icons/arrow-circle-045-left.png + icons/diagona/icons/arrow-circle-135.png + icons/diagona/icons/arrow-circle-135-left.png + icons/diagona/icons/arrow-circle-225.png + icons/diagona/icons/arrow-circle-225-left.png + icons/diagona/icons/arrow-circle-315.png + icons/diagona/icons/arrow-circle-315-left.png + icons/diagona/icons/arrow-circle-double.png + icons/diagona/icons/arrow-circle-double-135.png + icons/diagona/icons/speaker.png + icons/diagona/icons/speaker--arrow.png + icons/diagona/icons/speaker--exclamation.png + icons/diagona/icons/speaker--minus.png + icons/diagona/icons/speaker-network.png + icons/diagona/icons/speaker--pencil.png + icons/diagona/icons/speaker--plus.png icons/own/app.jpg @@ -306,6 +323,9 @@ icons/own/swift/swiftCartoonNova24.png icons/own/swift/swiftCartoonNova48.png icons/own/twr.jpg + icons/own/transparent1px.png + icons/own/arrowWide300x10down.png + icons/own/arrowWide300x10up.png icons/qled/circle_black.svg @@ -346,4 +366,8 @@ icons/qled/triang_yellow.svg icons/qled/round_black.svg + + icons/textures/texture-inner.jpg + icons/textures/texture-outer.jpg + diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 0b25434dc..08d276d5e 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -78,10 +78,10 @@ namespace BlackMisc CIcon(CIcons::StandardIconArrowMediumSouth16, "arrow south"), CIcon(CIcons::StandardIconArrowMediumWest16, "arrow west"), CIcon(CIcons::StandardIconClose16, "close"), - CIcon(CIcons::StandardIconCross, "cross"), - CIcon(CIcons::StandardIconCrossCircle, "cross circle"), - CIcon(CIcons::StandardIconCrossSmall, "cross (small)"), - CIcon(CIcons::StandardIconCrossWhite, "cross white"), + CIcon(CIcons::StandardIconCross16, "cross"), + CIcon(CIcons::StandardIconCrossCircle16, "cross circle"), + CIcon(CIcons::StandardIconCrossSmall16, "cross (small)"), + CIcon(CIcons::StandardIconCrossWhite16, "cross white"), CIcon(CIcons::StandardIconDelete16, "delete"), CIcon(CIcons::StandardIconDockBottom16, "dock bottom"), CIcon(CIcons::StandardIconDockTop16, "dock top"), @@ -104,6 +104,7 @@ namespace BlackMisc CIcon(CIcons::StandardIconResize16, "resize"), CIcon(CIcons::StandardIconResizeHorizontal16, "resize (horizontal)"), CIcon(CIcons::StandardIconResizeVertical16, "resize (vertical)"), + CIcon(CIcons::StandardIconSpeakerNetwork16, "speaker (network)"), CIcon(CIcons::StandardIconStatusBar16, "status bar"), CIcon(CIcons::StandardIconSwift24, "swift"), CIcon(CIcons::StandardIconSwift48, "swift"), @@ -112,15 +113,15 @@ namespace BlackMisc CIcon(CIcons::StandardIconTableRelationship16, "relationship"), CIcon(CIcons::StandardIconTableSheet16, "table sheet"), CIcon(CIcons::StandardIconText16, "text"), - CIcon(CIcons::StandardIconTick, "tick"), - CIcon(CIcons::StandardIconTickRed, "tick red"), - CIcon(CIcons::StandardIconTickSmall, "tick (small)"), - CIcon(CIcons::StandardIconTickWhite, "tick white"), + CIcon(CIcons::StandardIconTick16, "tick"), + CIcon(CIcons::StandardIconTickRed16, "tick red"), + CIcon(CIcons::StandardIconTickSmall16, "tick (small)"), + CIcon(CIcons::StandardIconTickWhite16, "tick white"), CIcon(CIcons::StandardIconUnknown16, "unknwon"), CIcon(CIcons::StandardIconUser16, "user"), CIcon(CIcons::StandardIconUsers16, "users"), - CIcon(CIcons::StandardIconViewMulticolumn, "view multicolumn"), - CIcon(CIcons::StandardIconViewTile, "view tile"), + CIcon(CIcons::StandardIconViewMulticolumn16, "view multicolumn"), + CIcon(CIcons::StandardIconViewTile16, "view tile"), CIcon(CIcons::StandardIconVolumeHigh16, "volume hight"), CIcon(CIcons::StandardIconVolumeLow16, "volume low"), CIcon(CIcons::StandardIconVolumeMuted16, "muted"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index c4bb6432b..43b482774 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -73,10 +73,10 @@ namespace BlackMisc case StandardIconArrowMediumSouth16: return arrowMediumSouth16(); case StandardIconArrowMediumWest16: return arrowMediumWest16(); case StandardIconClose16: return close16(); - case StandardIconCross: return cross16(); - case StandardIconCrossCircle: return crossCircle16(); - case StandardIconCrossSmall: return crossSmall16(); - case StandardIconCrossWhite: return crossWhite16(); + case StandardIconCross16: return cross16(); + case StandardIconCrossCircle16: return crossCircle16(); + case StandardIconCrossSmall16: return crossSmall16(); + case StandardIconCrossWhite16: return crossWhite16(); case StandardIconDelete16: return delete16(); case StandardIconDockBottom16: return dockBottom16(); case StandardIconDockTop16: return dockTop16(); @@ -97,6 +97,7 @@ namespace BlackMisc case StandardIconResize16: return resize16(); case StandardIconResizeHorizontal16: return resizeHorizontal16(); case StandardIconResizeVertical16: return resizeVertical16(); + case StandardIconSpeakerNetwork16: return speakerNetwork16(); case StandardIconStatusBar16: return statusBar16(); case StandardIconSwift24: return swift24(); case StandardIconSwift48: return swift48(); @@ -105,15 +106,15 @@ namespace BlackMisc case StandardIconTableRelationship16: return tableRelationship16(); case StandardIconTableSheet16: return tableSheet16(); case StandardIconText16: return text16(); - case StandardIconTick: return tick16(); - case StandardIconTickRed: return tickRed16(); - case StandardIconTickSmall: return tickSmall16(); - case StandardIconTickWhite: return tickWhite16(); + case StandardIconTick16: return tick16(); + case StandardIconTickRed16: return tickRed16(); + case StandardIconTickSmall16: return tickSmall16(); + case StandardIconTickWhite16: return tickWhite16(); case StandardIconUnknown16: return unknown16(); case StandardIconUser16: return user16(); case StandardIconUsers16: return users16(); - case StandardIconViewMulticolumn: return viewMultiColumn(); - case StandardIconViewTile: return viewTile(); + case StandardIconViewMulticolumn16: return viewMultiColumn(); + case StandardIconViewTile16: return viewTile(); case StandardIconVolumeHigh16: return volumeHigh16(); case StandardIconVolumeLow16: return volumeLow16(); case StandardIconVolumeMuted16: return volumeMuted16(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 453efadbf..247a755e9 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -27,7 +27,7 @@ namespace BlackMisc //! Index for each icon, allows to send them via DBus, efficiently store them, etc. enum IconIndex { - // keep indexes alphabetically sorted and in sync with CIconList + // !! keep indexes alphabetically sorted and in sync with CIconList AviationAttitudeIndicator, AviationAtis, AviationMetar, @@ -71,10 +71,10 @@ namespace BlackMisc StandardIconArrowMediumSouth16, StandardIconArrowMediumWest16, StandardIconClose16, - StandardIconCross, - StandardIconCrossCircle, - StandardIconCrossSmall, - StandardIconCrossWhite, + StandardIconCross16, + StandardIconCrossCircle16, + StandardIconCrossSmall16, + StandardIconCrossWhite16, StandardIconDelete16, StandardIconDockBottom16, StandardIconDockTop16, @@ -97,6 +97,7 @@ namespace BlackMisc StandardIconResize16, StandardIconResizeHorizontal16, StandardIconResizeVertical16, + StandardIconSpeakerNetwork16, StandardIconStatusBar16, StandardIconSwift24, StandardIconSwift48, @@ -105,15 +106,15 @@ namespace BlackMisc StandardIconTableRelationship16, StandardIconTableSheet16, StandardIconText16, - StandardIconTick, - StandardIconTickRed, - StandardIconTickSmall, - StandardIconTickWhite, + StandardIconTick16, + StandardIconTickRed16, + StandardIconTickSmall16, + StandardIconTickWhite16, StandardIconUnknown16, StandardIconUser16, StandardIconUsers16, - StandardIconViewMulticolumn, - StandardIconViewTile, + StandardIconViewMulticolumn16, + StandardIconViewTile16, StandardIconVolumeHigh16, StandardIconVolumeLow16, StandardIconVolumeMuted16, @@ -294,6 +295,20 @@ namespace BlackMisc return pm; } + //! Radio + static const QPixmap &radio16() + { + static const QPixmap pm(":/diagona/icons/diagona/icons/radio.png"); + return pm; + } + + //! Speaker (network) + static const QPixmap &speakerNetwork16() + { + static const QPixmap pm(":/diagona/icons/diagona/icons/speaker-network.png"); + return pm; + } + //! Joystick static const QPixmap &joystick16() { @@ -564,6 +579,18 @@ namespace BlackMisc return monitorError16(); } + //! Application audio + static const QPixmap &appAudio16() + { + return speakerNetwork16(); + } + + //! Voice rooms + static const QPixmap &appVoiceRooms16() + { + return tableRelationship16(); + } + // ------------------------------------------------------------- // Network and aviation // ------------------------------------------------------------- diff --git a/src/blackmisc/icons/own/arrowWide300x10down.png b/src/blackmisc/icons/own/arrowWide300x10down.png new file mode 100644 index 000000000..594dc0795 Binary files /dev/null and b/src/blackmisc/icons/own/arrowWide300x10down.png differ diff --git a/src/blackmisc/icons/own/arrowWide300x10up.png b/src/blackmisc/icons/own/arrowWide300x10up.png new file mode 100644 index 000000000..f87fcc34d Binary files /dev/null and b/src/blackmisc/icons/own/arrowWide300x10up.png differ diff --git a/src/blackmisc/icons/own/transparent1px.png b/src/blackmisc/icons/own/transparent1px.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/src/blackmisc/icons/own/transparent1px.png differ diff --git a/src/blackmisc/icons/textures/texture-inner.jpg b/src/blackmisc/icons/textures/texture-inner.jpg new file mode 100644 index 000000000..863bfa90b Binary files /dev/null and b/src/blackmisc/icons/textures/texture-inner.jpg differ diff --git a/src/blackmisc/icons/textures/texture-outer.jpg b/src/blackmisc/icons/textures/texture-outer.jpg new file mode 100644 index 000000000..6beafc1d8 Binary files /dev/null and b/src/blackmisc/icons/textures/texture-outer.jpg differ