From 12d7c10781f117702eca7f7ec911e5e805c8e570 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Thu, 13 Oct 2011 13:12:45 +0000 Subject: [PATCH] Fixes the blurry taskbar icon on Win7 (c.f. JITSI-964) --- resources/images/images.properties | 2 + resources/images/logo/sc_logo_20x20.png | Bin 0 -> 888 bytes resources/images/logo/sc_logo_32x32.png | Bin 0 -> 1568 bytes .../communicator/util/swing/SIPCommFrame.java | 43 ++++++++++++++---- 4 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 resources/images/logo/sc_logo_20x20.png create mode 100644 resources/images/logo/sc_logo_32x32.png diff --git a/resources/images/images.properties b/resources/images/images.properties index 02d5c125d..fbfdf1fbe 100644 --- a/resources/images/images.properties +++ b/resources/images/images.properties @@ -1,5 +1,7 @@ # service gui service.gui.SIP_COMMUNICATOR_LOGO=resources/images/logo/sc_logo16x16.png +service.gui.SIP_COMMUNICATOR_LOGO_20x20=resources/images/logo/sc_logo_20x20.png +service.gui.SIP_COMMUNICATOR_LOGO_32x32=resources/images/logo/sc_logo_32x32.png service.gui.SIP_COMMUNICATOR_LOGO_45x45=resources/images/logo/sc_logo_45x45.png service.gui.SIP_COMMUNICATOR_LOGO_64x64=resources/images/logo/sc_logo_64x64.png service.gui.SIP_COMMUNICATOR_LOGO_128x128=resources/images/logo/sc_logo_128x128.png diff --git a/resources/images/logo/sc_logo_20x20.png b/resources/images/logo/sc_logo_20x20.png new file mode 100644 index 0000000000000000000000000000000000000000..7c78db832e72995eab344c73fa45476b43afb32d GIT binary patch literal 888 zcmV-;1Bd*HP)`R%c*O*{oh-KQN}*b#PQR2m z^5wMt*U#ysQc4=4DBq}$`1@*pqw98cuPINRj3Z%xTV6PtL-l}s^DUs zF^gbVF@(*1vReo>#mEwZSRO-3_{4}IHbNY$OV;~Uc&eht7;~&LkC!NjL5mw$0Rzit zD%`vm7^@Q)mjLo<3#-5k#Ojj4FOZaL!oM#FVN!mKH`1NsMsC275;!aEgnZWnCRb16 zFl86N7+RHxE$int1tip}a&=tJyL8Q`U4fRPB~9xIr2*Mvzs^rqby&0Rn5^Rd;(Ya=+0 zZ_=QJ{de+~yDPI*Zx)rtAbYS5z~unKK?8EwU=Q8T(hKtw_kKj3`+qAR54|q#qFWLn zS|WLBWNgMcY>PR{t&#{iYygM^j6@*vaxlFFb&Y&#TYJYxdP^V@i#1-E0!CR;!1;Ha z!%fabA|wSsB0vNN3bUM)cif-qeSCK_-+h4~%p!>tf>y@sXZoMCM5k9A7Ng~AlE4HI z#5Wwd^l+-9!?hU<0Kn(k#%EWWB1}ySJGtU(>8sFYdoPg$wr;7wPy7MOkeI8e#y#2q O0000%3=})H!*n`KXP>uU zKcIr9Ev;kmCMS8hx&QP3opW;U1Emzh5fiExJU*Cn42EeHjLiFJFz1F1U}{B4Rz=Oi z$Nv`q*OdC##~0btN;2_q0SF;vbk(vKY+PcE!z^nef~N7I0TfQDpOiPT{>xt3^y$)q z4(|9l_pa~1Kh*jl9ha&xA@4J;>Ay9^N#>J+L9f-aDvtOH?4FMH>+3c?Sf6qSN}mp_ zNiQm^MrMJQT5~W$?nbM2ysg(>T0R(k$^fj}?sxKj{6&*)=L61ZV9X<` z2cu7U1XbB__1VmW;YpS8Vm8N#(ANpi9$m&rTj$Zj!RQI4G$nu|TUUJh%#26tKtq5O zg{%N??-OsIyyDBXSZ$KaCf*uXWN%u(`I8lW=~Eg3AxqdjS6P#6%mTFO03Qdrd0F-G zX8W8a%Q1h&O6k2>q~!Tp=dwjB*KF=9$B;+hs$Fd#VKeLpA1$3)mu?9wdfkqror%{b ztHxwUm%P_EJ6y4RRR%a6V%@*RvLBlbYeufIe5}5v&mx90g7Q^6C+BdHqZL(^)|}B} zASx7+LLrGfa+-IB-P~hTEt-}tDHNhYA&3&4qq*u{{8U9rQ*&2aW#yzX|GERkRnMhW zJX5!S%#(Ail0xC>74HG41UDS7SS6K0>J{(q-3{_HpAZ(yNd$TVn!fT58lWKG_N<{` zY+=WJ2BJbCtM|Sog@Tt=gpvv(yo$J}z#CO{>wUN2_57Mh2|xzp@+LVVC+-5!WUo>d zJl2^Tx|)b5c^yM#)}wm_r%~zbGK^s$iy#t@8=~=%hO<{Xta@uGH2{@u^Z3IMi5|I~ z$2;q|27d+@RrMrdb(jPCsV**$%N7x}#MNz0m)m!?IxSu$BNGzO{OS#aii<3FQUVYI z-lP8Z)?m~=&gQYs%x{vb^C1Z!3J*;@jORTUTR$8dai$p<)4JJe(W26uv9MQS%Zh>?D2PgcF$+I8{AQJz#(DMO|vc&ma3q$e*-7PbGZb<%4y82Sh z4PKX%PA$%|gS)nPQvxWSzG`ezZ#$LHW@KrF2skkW4hlq57NU*{2o?vjBQ3NxdCX@Q zeeqgnTq(3^94+Ay4NEtFSJzk00bjzAbJp)Du6_Ax;heQE0)YF}XU+N^?~H8US~4!^wVY{@>ZLT31fA7;$6lrd!vN%7P{IHV105g2iOhFn6Rq9a_nIec*mUT^ z)*%6mu2^m5jciX)F==cxh%<}Y_`#b;1Cd1p**x-Q^Gr5&CCc2C(+prl5F!JF z0r{iiKg}7cz!dK~cDr%=mVs>_0HA6NW@wF|3w0P=@wGSKSt9WZ#5 zMvW>^y&U?f<}|E1xe0Nn16h4eekaZZhG7*2CwfS(bU2yAOVz5C2?1N;u40{I0X Sy@%!i0000 logos = new ArrayList(6) + {{ + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO")); + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO_20x20")); + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO_32x32")); + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO_45x45")); + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO_64x64")); + add(UtilActivator + .getImage("service.gui.SIP_COMMUNICATOR_LOGO_128x128")); + }}; + m.invoke(this, logos); + // In order to have the same icon when using option panes + m.invoke(JOptionPane.getRootFrame(), logos); + } + catch (Exception e) + { + Image scLogo = + UtilActivator.getImage("service.gui.SIP_COMMUNICATOR_LOGO"); + this.setIconImage(scLogo); - // In order to have the same icon when using option panes - JOptionPane.getRootFrame().setIconImage(scLogo); + // In order to have the same icon when using option panes + JOptionPane.getRootFrame().setIconImage(scLogo); + } } /**