From 39150a1bc19e725185af0a961ef637f24ac20e50 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 27 Jan 2015 03:30:21 +0100 Subject: [PATCH] Formatting, added icons for callsign --- src/blackcore/context.cpp | 1 + src/blackcore/context.h | 2 ++ src/blackcore/context_network_impl.cpp | 6 +++--- src/blackgui/components/settingscomponent.h | 1 - src/blackmisc/avcallsign.cpp | 2 +- src/blackmisc/blackmisc.qrc | 2 ++ src/blackmisc/iconlist.cpp | 2 ++ src/blackmisc/icons.cpp | 13 +++++++++++++ src/blackmisc/icons.h | 7 +++++++ src/blackmisc/icons/vatsim/VatsimLogoWhite16.png | Bin 0 -> 819 bytes src/blackmisc/icons/vatsim/VatsimLogoWhite32.png | Bin 0 -> 2308 bytes 11 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 src/blackmisc/icons/vatsim/VatsimLogoWhite16.png create mode 100644 src/blackmisc/icons/vatsim/VatsimLogoWhite32.png diff --git a/src/blackcore/context.cpp b/src/blackcore/context.cpp index f2c1cd536..66f72aab6 100644 --- a/src/blackcore/context.cpp +++ b/src/blackcore/context.cpp @@ -6,6 +6,7 @@ * including this file, may be copied, modified, propagated, or distributed except according to the terms * contained in the LICENSE file. */ + #include "context.h" #include diff --git a/src/blackcore/context.h b/src/blackcore/context.h index 4d04e54bf..692ab51e8 100644 --- a/src/blackcore/context.h +++ b/src/blackcore/context.h @@ -7,6 +7,8 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKCORE_CONTEXT_H #define BLACKCORE_CONTEXT_H diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 5f1163f6e..cf5bf3b38 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -95,9 +95,9 @@ namespace BlackCore */ void CContextNetwork::gracefulShutdown() { - if (this->m_vatsimBookingReader) this->m_vatsimBookingReader->quit(); - if (this->m_vatsimDataFileReader) this->m_vatsimDataFileReader->quit(); - if (this->isConnected()) this->disconnectFromNetwork(); + if (this->m_vatsimBookingReader) { this->m_vatsimBookingReader->quit(); } + if (this->m_vatsimDataFileReader) { this->m_vatsimDataFileReader->quit(); } + if (this->isConnected()) { this->disconnectFromNetwork(); } } /* diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index bdf86aa30..153171a92 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -40,7 +40,6 @@ namespace BlackGui enum SettingTab { SettingTabNetwork = 0, - SettingTabAircraft, SettingTabAircraftAudio, SettingTabSimulator, SettingTabGui, diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index dd4fe6d77..e36e129ad 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -63,7 +63,7 @@ namespace BlackMisc if ("FSS" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleFss); } if ("ATIS" == sfx) { return CIconList::iconByIndex(CIcons::AviationAtis); } if ("EXAM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleMnt); } - if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkVatsimLogo); } + if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkVatsimLogoWhite); } return CIconList::iconByIndex(CIcons::NetworkRoleUnknown); } diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index b4a10cec3..8017b5005 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -85,6 +85,8 @@ icons/vatsim/SUP.png icons/vatsim/VatsimLogo16.png icons/vatsim/VatsimLogo32.png + icons/vatsim/VatsimLogoWhite16.png + icons/vatsim/VatsimLogoWhite32.png icons/diagona/icons/application-cloud.png diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 7c7ed5597..a8162c43c 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -36,6 +36,7 @@ namespace BlackMisc static const CIconList icons( { // keep indexes alphabetically sorted and in sync with CIcons + // req. for "iconByIndex" CIcon(CIcons::ApplicationIconAircrafts, "aircrafts"), CIcon(CIcons::ApplicationIconAtc, "ATC"), CIcon(CIcons::ApplicationIconAudio, "audio"), @@ -76,6 +77,7 @@ namespace BlackMisc CIcon(CIcons::NetworkRoleTower, "ATC tower"), CIcon(CIcons::NetworkRoleUnknown, "unknown"), CIcon(CIcons::NetworkVatsimLogo, "VATSIM"), + CIcon(CIcons::NetworkVatsimLogoWhite, "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 214249902..a391cee86 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -463,6 +463,18 @@ namespace BlackMisc return pm; } + const QPixmap &CIcons::vatsimLogoWhite16() + { + static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite16.png"); + return pm; + } + + const QPixmap &CIcons::vatsimLogoWhite32() + { + static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite32.png"); + return pm; + } + const QPixmap &CIcons::capabilityVoice() { static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png"); @@ -537,6 +549,7 @@ namespace BlackMisc case NetworkRoleTower: return roleTower(); case NetworkRoleUnknown: return roleUnknown(); case NetworkVatsimLogo: return vatsimLogo16(); + case NetworkVatsimLogoWhite: return vatsimLogoWhite16(); 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 78663430d..f3cd2142b 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -68,6 +68,7 @@ namespace BlackMisc NetworkRoleTower, NetworkRoleUnknown, NetworkVatsimLogo, + NetworkVatsimLogoWhite, NotSet, StandardIconAppAircrafts16, StandardIconAppAtc16, @@ -462,6 +463,12 @@ namespace BlackMisc //! VATSIM logo static const QPixmap &vatsimLogo32(); + //! VATSIM logo + static const QPixmap &vatsimLogoWhite16(); + + //! VATSIM logo + static const QPixmap &vatsimLogoWhite32(); + //! Full voice capability static const QPixmap &capabilityVoice(); diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png new file mode 100644 index 0000000000000000000000000000000000000000..fc428253f16e474ce67792d4e2fce417cc834570 GIT binary patch literal 819 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