From 881304dc2f8fb75f9121d1966dda6cb64c3a73fe Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 9 Dec 2017 19:29:51 +0100 Subject: [PATCH] Ref T203, OS icons (icons from wikipedia marked as public domain) --- src/blackmisc/blackmisc.qrc | 5 +++++ src/blackmisc/icon.h | 4 ++-- src/blackmisc/iconlist.cpp | 6 ++++- src/blackmisc/icons.cpp | 31 +++++++++++++++++++++++++- src/blackmisc/icons.h | 22 +++++++++++++++++- src/blackmisc/icons/os/linux_24.png | Bin 0 -> 1141 bytes src/blackmisc/icons/os/macos_24.png | Bin 0 -> 564 bytes src/blackmisc/icons/os/windows_24.png | Bin 0 -> 757 bytes 8 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 src/blackmisc/icons/os/linux_24.png create mode 100644 src/blackmisc/icons/os/macos_24.png create mode 100644 src/blackmisc/icons/os/windows_24.png diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 231bfa73e..1ad3e0ed8 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -576,4 +576,9 @@ icons/famfamfam/icons/silk/controller_delete.png icons/famfamfam/icons/silk/controller_error.png + + icons/os/linux_24.png + icons/os/macos_24.png + icons/os/windows_24.png + diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index bac5a2c91..08dcf1ecc 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -58,8 +58,8 @@ namespace BlackMisc * the derived class uses this macro to disambiguate the inherited members. */ # define BLACKMISC_DECLARE_USING_MIXIN_ICON(DERIVED) \ - using ::BlackMisc::Mixin::Icon::toIcon; \ - using ::BlackMisc::Mixin::Icon::toPixmap; + using ::BlackMisc::Mixin::Icon::toIcon; \ + using ::BlackMisc::Mixin::Icon::toPixmap; } // Mixin //! Value object for icons. An icon is stored in the global icon repository and diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 101f7d050..3aed5c41a 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -95,7 +95,11 @@ namespace BlackMisc CIcon(CIcons::NetworkVatsimLogo, "VATSIM"), CIcon(CIcons::NetworkVatsimLogoWhite, "VATSIM"), CIcon(CIcons::NotSet, "?"), - CIcon(CIcons::StandardIconAppAircrafts16, "aircrafts"), + CIcon(CIcons::OSAll, "All OS"), + CIcon(CIcons::OSLinux, "Linux"), + CIcon(CIcons::OSMacOs, "Mac OS"), + CIcon(CIcons::OSWindows, "Windows"), + CIcon(CIcons::StandardIconAppAircraft16, "aircraft"), CIcon(CIcons::StandardIconAppAtc16, "ATC"), CIcon(CIcons::StandardIconAppFlightPlan16, "flight plan"), CIcon(CIcons::StandardIconAppLog16, "log"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index a05636dab..70503df1e 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -472,6 +472,29 @@ namespace BlackMisc return pm; } + const QPixmap &CIcons::osAll() + { + return empty16(); + } + + const QPixmap &CIcons::osLinux() + { + static const QPixmap pm(":/os/icons/os/linux_24.png"); + return pm; + } + + const QPixmap &CIcons::osMac() + { + static const QPixmap pm(":/os/icons/os/macos_24.png"); + return pm; + } + + const QPixmap &CIcons::osWindows() + { + static const QPixmap pm(":/os/icons/os/windows_24.png"); + return pm; + } + const QPixmap &CIcons::preloader64() { static const QPixmap pm(":/preloaders/icons/preloaders/FillingRing64.gif"); @@ -1071,7 +1094,11 @@ namespace BlackMisc case NetworkVatsimLogo: return vatsimLogo16(); case NetworkVatsimLogoWhite: return vatsimLogoWhite16(); case NotSet: return empty(); - case StandardIconAppAircrafts16: return appAircraft16(); + case OSAll: return osAll(); + case OSLinux: return osLinux(); + case OSMacOs: return osMac(); + case OSWindows: return osWindows(); + case StandardIconAppAircraft16: return appAircraft16(); case StandardIconAppAtc16: return appAtc16(); case StandardIconAppFlightPlan16: return appFlightPlan16(); case StandardIconAppLog16: return appLog16(); @@ -1118,6 +1145,8 @@ namespace BlackMisc case StandardIconInfo16: return info16(); case StandardIconJoystick16: return joystick16(); case StandardIconLoad16: return load16(); + case StandardIconLockClosed16: return lockClosed16(); + case StandardIconLockOpen16: return lockOpen16(); case StandardIconMonitorError16: return monitorError16(); case StandardIconPaintCan16: return paintCan16(); case StandardIconPaperPlane16: return paperPlane16(); diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 8cb13c595..a968f9cda 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -89,7 +89,11 @@ namespace BlackMisc NetworkVatsimLogo, NetworkVatsimLogoWhite, NotSet, - StandardIconAppAircrafts16, + OSAll, + OSLinux, + OSMacOs, + OSWindows, + StandardIconAppAircraft16, StandardIconAppAtc16, StandardIconAppFlightPlan16, StandardIconAppLog16, @@ -440,6 +444,22 @@ namespace BlackMisc //! Database table static const QPixmap &databaseTable16(); + // -------------------------------------------------- + // -- OS icons + // -------------------------------------------------- + + //! All OS + static const QPixmap &osAll(); + + //! Linux + static const QPixmap &osLinux(); + + //! MacOS + static const QPixmap &osMac(); + + //! Windows + static const QPixmap &osWindows(); + // -------------------------------------------------- // -- Preloader icons // -------------------------------------------------- diff --git a/src/blackmisc/icons/os/linux_24.png b/src/blackmisc/icons/os/linux_24.png new file mode 100644 index 0000000000000000000000000000000000000000..e014dc89a8e2740d0ee541c84488b525b09a9354 GIT binary patch literal 1141 zcmV-*1d98KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D00v@9M??Vs0RI60 zpuMM)000B{NklgxF1 zvEL!ihsOxOL?u#(cja6bkV;StTDNk?xh_`se`OXqmw?^&z}=(2vJ*-h*;|fydQq z_5Ty33@!5kJ;vum++7qfc~?YOWrN;S%j3~#^l?5&BAwt-o9hHrmOg}Y4nwpKz;Wan zS`W9&D{#7^qCzc?(^Fbn+DXNisDVj0k>%xOiFRLN@#5m*lm<`9kapBc_x0QDcF+y7 zcbokDd^9&VBQGzH)%j&w|B@WyBnyhvE?=2UrmXJnZrPOz>q&;uXk?;i>D3?M4kAI2 zGCEpbUT#;ZRB*f9td0lN+7{rF~Vo`?q#4u>%~IEayv5q>1u zs}sD1wgfGvSmmkCFn;%*$Hc^h?0qmZx5qH_^;=*^b9i_dxmp!V=r0x%>D{%BHnr!S z&d8Yq4Kby?{2#O(`ySaj`Jfozgk+{~^y5(74a_eKc+q_yr#t7d9v944uLsYGueU3| z`_L0UZq!NqY-VRk2!$nl`lT0UvpJ;~sb2VV{2M%4G>c}(8mddy$p=L4!}QBk;b($z z@A^YZQC=<6b1;gEhZR^@*!U3aL=;8DBlGfX8&_>C^N1_bC&VR1O!jS|$)pTl4WhcL zjAyh76Z3k#Flc6E&o*pXp)OvlxcL6QzgwJZxw1cjkG{>q^uGsCRaJ#ZB!bb=QTV5B z;d5@6H30qtd;@yddoY4i00000NkvXX Hu0mjfYW*MI literal 0 HcmV?d00001 diff --git a/src/blackmisc/icons/os/macos_24.png b/src/blackmisc/icons/os/macos_24.png new file mode 100644 index 0000000000000000000000000000000000000000..058f0ae93c1e54dff5ad53488138258092227364 GIT binary patch literal 564 zcmV-40?Yl0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D00v@9M??Vs0RI60 zpuMM)0005ENkl7CYfO2Iflcb)J|v_Q0>?2HCn9} z>h(IjUa!nKVS7xY(I|4c9AdE;gb-LP78s32IG@jQ70F~0KA#V_+YQs{6zz5!`~9BZ z{zh0D&nlEtyaT!yXA~Ty$7LCNFG0(j}x>CixsGQkj-XgZFSh~c4#)6 zcsw4QF;NWS@i;5@(B9ndcaEM>3<7}wEBDX}>`)Bo#OUHQDaGJ$IIwaL^(8wLgXMC` z$~|;fsD)Ue7)&M;R(g;@sZ`>~L@`*cRvEDfkk zx~1xNyEq!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z;_sg8IR|$ zNC65mCV9KNEIxkgy%dncUgGKN%KngpgG*O-)#go}Kq1u<*NBpo#FA92&f^N{2$g$P<48w`dy~zT)aooY15Ai88)intd5Qo zZ7V(~Sgzp6JJ7H5&M!Q!-}zA6kuA!f)7oCGe77z=M+A9B%$Kfp2^Oi1XW(|PiF~>_-Xi%L#Wp=sylf7Nx`a&g^cZrip9sz zE$