From 0bb81b3279c0ee5ca26beb173af3b6c2f6cceb3b Mon Sep 17 00:00:00 2001 From: albertony <12441419+albertony@users.noreply.github.com> Date: Thu, 7 Jan 2021 14:51:59 +0100 Subject: [PATCH] Use 32px tray icon on windows --- src/gui/res/Barrier.qrc | 3 +++ src/gui/res/icons/32x32/barrier-connected.png | Bin 0 -> 1440 bytes src/gui/res/icons/32x32/barrier-disconnected.png | Bin 0 -> 1830 bytes src/gui/res/icons/32x32/barrier-transfering.png | Bin 0 -> 1522 bytes src/gui/src/MainWindow.cpp | 5 +++++ 5 files changed, 8 insertions(+) create mode 100644 src/gui/res/icons/32x32/barrier-connected.png create mode 100644 src/gui/res/icons/32x32/barrier-disconnected.png create mode 100644 src/gui/res/icons/32x32/barrier-transfering.png diff --git a/src/gui/res/Barrier.qrc b/src/gui/res/Barrier.qrc index ee6127d0..a6e22e20 100644 --- a/src/gui/res/Barrier.qrc +++ b/src/gui/res/Barrier.qrc @@ -57,5 +57,8 @@ icons/32x32/barrier-connected-mask.png icons/32x32/barrier-disconnected-mask.png icons/32x32/barrier-transfering-mask.png + icons/32x32/barrier-connected.png + icons/32x32/barrier-disconnected.png + icons/32x32/barrier-transfering.png diff --git a/src/gui/res/icons/32x32/barrier-connected.png b/src/gui/res/icons/32x32/barrier-connected.png new file mode 100644 index 0000000000000000000000000000000000000000..813b59d27798bcebf39d6e2e5ad441ea5b235a14 GIT binary patch literal 1440 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 U`|kRtRR91007*qoM6N<$f|2!fdH?_b literal 0 HcmV?d00001 diff --git a/src/gui/res/icons/32x32/barrier-transfering.png b/src/gui/res/icons/32x32/barrier-transfering.png new file mode 100644 index 0000000000000000000000000000000000000000..9149860bc085712ff05956b36044d0b74498e4e4 GIT binary patch literal 1522 zcmVg3kcSn;8EA`4n7kALQCp;x2@E>sbQ(9!+|!AO+jIsoj!mPUeNSoK z<#G|DG4YR`CGcnhU{F%_#&D20cIvgkbdWrC;pl z00FI4fStKYU%EYQQ>L?cY^Dn0XUg?DjGL~dtOT2uLwTlsnGS{eJdESki0(14(4q;aGIBU z=r>p3kz09IoS!6**mN`qA&Hj*UmuYpbA@}i`2^7^U`h9HcbE1YtL z3OIwSECDJM%oI?zyO*f+?nI?`y9N5_G0rKu*46AdS+4Dh*oOt1I7|h`0X<8AQU@%I z;p4zpfUrnrhvTMU2>x>tM|i(bB$*r?-HZ3tz`lPWDjL%`1o}XzQD8o}$qN4m__D%1 zKsQ(Lb}Q8LN;pRU19*iIZUtJo zN%D_0nvcDqpKdA=BNVkEvg}F>pmcPExrbcLOuT~s^Y>3p9H?; z7=7ool?mPwSxY0wb0U4v>cxl`dMI?ivjuPtuUfLWxQxVB%gFk}Yg+?~%bDe02JX_( z!0b$N=*te$*Vi|Ijx(1@M$t*8!16%?dymh4URb8c@-94bzdv-ah)03Wv`yQ9ol&5a zhUaTEl)xx(o@XEch4pj1V?Pt1kyRS7=7ZAk6Rbe`6hmQDz9UG{LK=$ z?Wt-KISJSKA3O2geOhAnh`9tPv@ZneOafV40{yuCg%w|sqKR>KFKF^Z=uYDoRU675 z#}{YVElsRGK^GZU>4y@aed%XR0&~FktnfcT4e$dNtnE4yjH1VjRum?NrZn{5j1i!y z|7MVY>70oN0!E2>AP*=&3~&T54EJm5y@ZNSg-Pljwg3&KfhGad@sI+K+XCZC^F_(^ zee5YWe#E+mHsc z!v}4{CvDRp;UmclXgm4y=|_DKAw2J?{JWwz9_~?$J|$1}FCHx|onQ8sk@1|D*|XOE Y1vDVB;4k*CJ^%m!07*qoM6N<$g1BVay8r+H literal 0 HcmV?d00001 diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index ebda1e24..2d8b20a4 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -74,6 +74,11 @@ static const char* barrierIconFiles[] = ":/res/icons/32x32/barrier-disconnected-mask.png", ":/res/icons/32x32/barrier-connected-mask.png", ":/res/icons/32x32/barrier-transfering-mask.png" +#elif defined(Q_OS_WIN) + ":/res/icons/32x32/barrier-disconnected.png", + ":/res/icons/32x32/barrier-disconnected.png", + ":/res/icons/32x32/barrier-connected.png", + ":/res/icons/32x32/barrier-transfering.png" #else ":/res/icons/16x16/barrier-disconnected.png", ":/res/icons/16x16/barrier-disconnected.png",