From b6e03dbc260a26f47a9b4a5ba609c72dd8eec440 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 23 Nov 2015 10:07:44 -0500 Subject: [PATCH] Load gesture images as symbolic icons This makes them recolor in the dark theme, which looks better. --- gtk/Makefile.am | 4 +-- .../{pinch.svg => gesture-pinch-symbolic.svg} | 0 .../gesture-pinch-symbolic.symbolic.png | Bin 0 -> 1039 bytes ...gesture-rotate-anticlockwise-symbolic.svg} | 0 ...rotate-anticlockwise-symbolic.symbolic.png | Bin 0 -> 1464 bytes ... => gesture-rotate-clockwise-symbolic.svg} | 0 ...ure-rotate-clockwise-symbolic.symbolic.png | Bin 0 -> 1632 bytes ...retch.svg => gesture-stretch-symbolic.svg} | 0 .../gesture-stretch-symbolic.symbolic.png | Bin 0 -> 977 bytes ...esture-two-finger-swipe-left-symbolic.svg} | 0 ...wo-finger-swipe-left-symbolic.symbolic.png | Bin 0 -> 764 bytes ...sture-two-finger-swipe-right-symbolic.svg} | 0 ...-finger-swipe-right-symbolic.symbolic.png} | Bin 940 -> 882 bytes gtk/gesture/pinch.png | Bin 1098 -> 0 bytes gtk/gesture/rotate-anticlockwise.png | Bin 1532 -> 0 bytes gtk/gesture/rotate-clockwise.png | Bin 1691 -> 0 bytes gtk/gesture/stretch.png | Bin 1040 -> 0 bytes gtk/gesture/two-finger-swipe-left.png | Bin 936 -> 0 bytes gtk/gtkshortcutsshortcut.c | 23 +++++++++++++----- 19 files changed, 19 insertions(+), 8 deletions(-) rename gtk/gesture/{pinch.svg => gesture-pinch-symbolic.svg} (100%) create mode 100644 gtk/gesture/gesture-pinch-symbolic.symbolic.png rename gtk/gesture/{rotate-anticlockwise.svg => gesture-rotate-anticlockwise-symbolic.svg} (100%) create mode 100644 gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png rename gtk/gesture/{rotate-clockwise.svg => gesture-rotate-clockwise-symbolic.svg} (100%) create mode 100644 gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png rename gtk/gesture/{stretch.svg => gesture-stretch-symbolic.svg} (100%) create mode 100644 gtk/gesture/gesture-stretch-symbolic.symbolic.png rename gtk/gesture/{two-finger-swipe-left.svg => gesture-two-finger-swipe-left-symbolic.svg} (100%) create mode 100644 gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png rename gtk/gesture/{two-finger-swipe-right.svg => gesture-two-finger-swipe-right-symbolic.svg} (100%) rename gtk/gesture/{two-finger-swipe-right.png => gesture-two-finger-swipe-right-symbolic.symbolic.png} (84%) delete mode 100644 gtk/gesture/pinch.png delete mode 100644 gtk/gesture/rotate-anticlockwise.png delete mode 100644 gtk/gesture/rotate-clockwise.png delete mode 100644 gtk/gesture/stretch.png delete mode 100644 gtk/gesture/two-finger-swipe-left.png diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 61dcd7d0f0..62741758d4 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1201,9 +1201,9 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc n=`basename $$f`; \ echo " cursor/$$n" >> $@; \ done; \ - for f in $(srcdir)/gesture/*.png; do \ + for f in $(srcdir)/gesture/*.symbolic.png; do \ n=`basename $$f`; \ - echo " gesture/$$n" >> $@; \ + echo " gesture/$$n" >> $@; \ done; \ for f in $(srcdir)/ui/*.ui; do \ n=`basename $$f`; \ diff --git a/gtk/gesture/pinch.svg b/gtk/gesture/gesture-pinch-symbolic.svg similarity index 100% rename from gtk/gesture/pinch.svg rename to gtk/gesture/gesture-pinch-symbolic.svg diff --git a/gtk/gesture/gesture-pinch-symbolic.symbolic.png b/gtk/gesture/gesture-pinch-symbolic.symbolic.png new file mode 100644 index 0000000000000000000000000000000000000000..dbdb173cf3631d468c0c84041968337d948d7148 GIT binary patch literal 1039 zcmV+q1n~QbP)$ZowhNj^;9hn^vH|(FCl~8T@f@?=`R4QBuf>P>E0cF|uQ0)mV?KIrV}hN=60kLL zVoTO`J^s<%(P=z`$*65xf}KU&JOR0!6h_ZunVuLa1Prub%CRdlGLg0IOmMhJ{=kEgofHC6 z=ZQ-3YGmN$tnE5s`CFERIg1&hu>@?43>+8IAFLB*`jZKc^^(aI1eZ!csZ23~2keA&09Wd)1#a)AcvuK{ zJ-Yc~);6wtu`?q~l<-p2zI~Vp_%XUUp0(}hppfLCHAut+Ohwm^ zXMdj(@_j0%3VSpdak2BS#gg|S>4nbb0vmOI_dO>;I`{AP3u}DBYA{9VLFIOPYA4`g zp<2p2&EpN+gU=Hc@5Z@Zbl=*5pbH5g?DXy}seC8S#2I)LUpFA&WCGwKd{ENBr$Sb! zJJ6m46#dv>0*?s8_rk30H(^_R*pJpr{m|lR^}oT>`Uw`o002ov JPDHLkV1f!7-i81G literal 0 HcmV?d00001 diff --git a/gtk/gesture/rotate-anticlockwise.svg b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg similarity index 100% rename from gtk/gesture/rotate-anticlockwise.svg rename to gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg diff --git a/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png new file mode 100644 index 0000000000000000000000000000000000000000..254ab330f8ad3ee84c6d103e62d55b5dd4e5ca80 GIT binary patch literal 1464 zcmV;p1xNacP)wx7Jx+P#Y(41^2;V~Q7gk6b$3_8oN|SjyK)(mLCCPxo;1u9* zT<5xgXMh>NFrXedA9w*csL8bhC;HgC4+(G*aGgiT`$}AqP)wn)8rP{U!1MswnaI;u z@~f)I-2|NK{GJPR;GcwlfU)u1kB7OMGy8$l9ex403Rnib0o;hZ=O9V=SJOMs;y%-W z-|-5ppNllCD z|Md}lE#OX(J;0ENcK$~*=BHOe=KRYXouwLofy1*&z!L5MXJhz054Z+d4-AcAhkKAL z>W=ON)&OfMU+Ace-w9l-@%AD+I8zd5Q@*&F702;f;1c8=Ru27yWOlG7Qv@yr+BCUC zz(v3p8t+%k6|hzN{c)m^S>Q-uGp<9QAX5#%8NmI(!@va&?^tBSRq}1XX}})JtHbmf zsS3+{i+eq;Lw^9n9sVLJ18GIxv(d;lSMi&XO0XF}6zw7hr4QvRw!0kO)l_#}t@a+! zc*`B$RN%`1T}5kvlM{?76t>_xc9O%>OWaFcKqD|kuR&vgDS zGuW#~dUy)Id9IhNyvhj{;+Cd5j2MjnQdlQ_A@ium=1zm|afw9}0aK6#jheqzv+)k> zrn7@oj_9TYj7lt;h z&KO6o30Zj_aOfl4K49t?2YiiP+3WNpm7{vQL1zro@!jiltrIz4$OJ=?{eGAwZ3&p~ zv13ZWSYTzq_11*qv&L}XN~C|c3U`pKMr%F#+YIsz1g{o5G+Psa7UZ?+Ku(S)*DzKq z=*^32G)I#+4W11a_CRJAziQe|%1M}jxeD|H4pRae4cAoyUJtllvkxd5kt3@=kuqC> z+uqjkriIgIImBhkl0me5`*=2pt;LsuD zsLXGA%UuFSV1A+xdUR%`6j&+=7;kZdPULVz$7&0`UXg$Tc5D4tJ$mzU5O_@z0P-P% z=_WnMhYkt_WS@|A@HI)m5Xz6Xs!+FBDgRI zfn}NifOm2bT&4+_g!BZm4zOkkuo(n({EYh@K)=Ok+;0H$NC(0M6Se|Cj<;TmpqCal zq;ZqUn7hGQ(aj0QU54jU3MdS<5Ur{sp$I&Id`OYyhN%nrr1o}F41NH81^)qjsj%4? SpIqet0000kz`e2q?mJdi6FtPH3 zSQJTQf|Z(LfglO>A;?TE6_d;;BTcc4lp@m_HEqhY*O>OO$wqBXAJ#tHb~qgO z=iY0~9~Sq_+G{`7eyz3l+5>H9LmM(eb-5c*ZY%<>E_WkrXqREx7XzC)3pybS^a0)j z9H0rfro7DwM^#GYoD0+g_W(nH8ejTRU^uX+$a<=QLBK$u75EF-0UR%~+@cyZ8~7a= z?I_v{v`<)14e%WBQ$V@@0$YGlNtH;7I^dIl2D#L#zJDP3G8hH?5>bz)l|a{o^%R6U zf=9!pUBFKB-2n7WSkHLil&|a~z*^uHU@LIam;NEpC1HKB&>LtZT={pAQP^Rqd%}9^ zfD@|RMqmv2ma8YQ1n-Pnny}7Tc!O}|pC`A@=iwcRF2IFAhnV%et;*dE^f3Hd-~nJ3 zFjkc}RmrykHx;HgYgNG$1Jchy{C-zvn&F=Z ztj4>1J^=b5ChdL2f7Rrfqj)O`UN)LOGx>U`dj2tON)5LFlMsKuXF&R$szLk6*=s$W zH8lX8fa?^m*))2n;lh&1|IP9`~+bzvA^XzYoQ%cRpe%HUb?DZ!7RtoXlz3N!^*Q zch<*}$F&T)9WCbf8^mdfYU45B8Q@CAI|AH`SRgCX?0^I6+a39!y+Wf2nZAP+?|bt* z6MOq=4Y}9{j0O%{@@0aX$*sSm$R)`tqSx;v#Ll~a|BQ4h@{U&dByq6$BbdU-jeHT^8`m`y( z2e?t?dp1U%`%0og3K&SVB0u8w9cszH?C{eea?VaF$TBiy^8pUwbyj9zztNqK9E{Ei zOdxtRHz?T};17$u9{u*nWk;`K8<}JVbVIzYJIId!X~gjYT|5GuZ;@Y!jQ&(4&afZ3 zn%_YQJ62duZqIEb$>1#jdhh}NX8u@C+joS*zBu{{>~v}tk@rLuG>ZB`&n>_q}7 zU6E*VU*K~jZ0@90Ng*?!9pdAcYV=0}w;}fsn*TA$gR@0-K=%?VzY%eY!j90|;VM}N z3@TvED-cE}ut%l}g6+Dh z(r8wi%7dKA%dJ#gY9wZqsE|G2U;(n_#$(6>2`dWefbDjXioh1+Eo15!Kxq#+N$3o@ zcSe~&KSZoVdLcX21#zCMm5Yv(;?Xw>wg-#lqKC6oTBAReHwzkw{|Gx3EX_cPVrXQx z>gJVeBB?txMZ@+c|}P9tl6Iq)XZ e5p8HgLi`7qfBVn-SgMNv00006 literal 0 HcmV?d00001 diff --git a/gtk/gesture/stretch.svg b/gtk/gesture/gesture-stretch-symbolic.svg similarity index 100% rename from gtk/gesture/stretch.svg rename to gtk/gesture/gesture-stretch-symbolic.svg diff --git a/gtk/gesture/gesture-stretch-symbolic.symbolic.png b/gtk/gesture/gesture-stretch-symbolic.symbolic.png new file mode 100644 index 0000000000000000000000000000000000000000..86fe89a5d2f210101aa67798311fd522c8670081 GIT binary patch literal 977 zcmV;?11|iDP)7;N1n8RGWXLItJAXy;ufLE9XuR z0reqxOSbi6E@WCcE-CSxBcK=m_}-7W&EI1##@+K;uZfY5X(sd zTJf*omVqJQH|Bym1F_-~VBLo482V*wlwAzOi9#rrP4-_#`q@BrR{(lYp9LilpT2ED4DFoLGgVt1+QjT}a z-x17E7eXIv&Zy2%2^dq3`{nO7#4w19F|&)k2u_1V+1`U$(D3XT(4@p{M!YOJk9ZrD z^|;qQ1i>$FPbnmv!@QsOYyx--{IsCRH51T=e<{3#nCFiodT_;p#8V{z#Kxu?dD}J9 zq5!&$qp$4;&GGlR?(m3}#=Q;P>^IYb<>$|w;Jm2T}em?iy?|IJY z($dn>($bQe0qnyiJjYLb#S4sMZ?ei7U>hc|5Qs^Pr75v@?7^(C_{I2+T}dkK0b{bu zysY@en8lU^^@5`{&NV4s{9;VV`bMLiz^@8kRdGQ$UBXbt;v|FJtwB++jT*bkHoR@() zH$>L3L)OraMdnRKjt??|yL!{HL-Ddg&hEMmxRpqJmAGHGc-W2)eIPCr->|6{2EbOl z>jROU;wyI6DL8LGy#e>IxkJv@z?`=++C@#Bcp!TgneM^df3Y4<l!{xFgO0 zIIdn3;7Y;y@rwFNu@X1L89?^TJ}oTnLWwc(rQrNb6=5+9;c|t%VdcctH71JK*Ghw` zy%h=-H&El4C{{#{uOdDLjovBB(Bw~GRDwH2h$an4cBd$!Nduzp6ivNbZ?XwSHOkl~ z*onStI!!Vv+;p1!36vRAD`lF_e{DdSrqj0u)X@a%XiQDglP37j(i)JufYh`Gq%I&e ztpTYENKF$4^wS>TFWM_0bpfeq4M<%;YFYzQ7m%9PfYb$~X1N(Kzx2RzGvL+I1Ix*P uc^v4)#G#jvsbd~*^x%(`EiEnoKEDBBbxI*KU`^Qo0000}KXfk$L90|W1M5N34Jm|elZz#v)T8c`CQpH@mmtT}V`<;!{Mngwt0I*&azW@LL diff --git a/gtk/gesture/pinch.png b/gtk/gesture/pinch.png deleted file mode 100644 index ab3b9f506a0d4e5d1b2f5faa9bd18ad27984fae8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmV-Q1hxB#P)dxeQ%h)kDOSSjeVZra4fqM?4%GdtcHf^Xk=)m zknqkVI2_AKJTD~ExsXCYEe+FQMFLh@I03nw!A?Aa@?03>?Gt+4!|WreEyskjsY)2riX? zo+`zVaB04U3B`IogI^;Oa%0cow?z_=-@8>2Fsz44aUH%)Ff@&qaifqF&l7ruZx%^H zl>{uhQrx9j@^U$y$wGrVgr935U{RG~jc~8z6OZB9ttF!S@;Y>~o<>~|Bih!%} zPjuYv-4qWB0k1_nU&zKrIs(jPQb?5WVl=*OkO}x9+BuSq?U+ZwFStm!Lh`Y%2bqAW zXy*zcC!8!%vI`eP|Bv)YKtBb=q;@*mUKSBBAJ!|@)UM1n88HF-qV2W9qwS6a9rs7u z6ID3XPs9X_N868PzfTDDJ{9AoGa8Jz**R{u<$X|kqw`pajk@pqd6OW;^}GGTGd?_> zsPv%TR(onE;L#0;hU(>wuLWxot?$Uj6+*Yod|FKnt)Bd+>&K0kb?da=>#+W(sfu za5*wD_NlP};Ep5%ih?tMzj2-G0iFkDBLUO{7XdE;N0eL#aGH<3hmZiLd-$_}ElR&1 zSWwwe;$Z`>Q`>==0kU(DyKm&zm5{p)IMauJJg`ye{{u{j<#mN{nR4bZaIV9z0j>vD z0B-=dBF{NU68=?s7e>5h1MsubUmn~03gBhs$g>Ww7Wk0j=l%=eL`PQjJ8NQv!0Ca*AP3>a%bCNhnDbk_iR%nWA4v{8hyz(NX3+t3!^N#yPs zY*piDJG?F*T}@_LG{3)z>1z(?#+?U7#ZZh@WLcusrvmw z89vWP_5urlQDxZS0VIps(Y?r;yNSY$j>-7Fz!i#j5P5^MC9#FV4bj|k9Iphfq;Svu z6O!2)B~uGr4YVt{KHyT|GsXK2dj;%N|F2IpvJf~HdFe0?eS~aZ0nP&+1|CD!U4WC2 z8P~|S1Lpt-D69_KV`M5U^;g`RaUJ>-nWaHCHQqqlkmqb1@|tV-tw<$=nLiBeBLk%m z5|nZ3K8JS$r5!iBy+;&prNcW5_&h+@&_>|&1Y?SX?YNFjad^7Kz0`xO^UaFauI%No z&jDkS3@9pk5vTfr5f1MUf&+L4I8OaO;IV1z3sgM;BLc<_DH*elwwI7KxD(kSdToS7 zE~0$d2ui><_5U2_?+S~(dZdSE@VjR`AIhtYU=eO>KK6E7bjCY!O~}r(+oARN_W`SdNx+wcD|<~pP&})5SailC9p8gKV_nGk zLMj-AyzfWZ(&mAyJa%jem;k&JFy59>e4)_*T!-}U)=_vM;YXW1`nxRh6A9ieb}C!b zfK|w2)rlOCRIK|G7P@&+ismVK+vGVhggube#jl$7Q{^N~#a;#afWwx6M$5QK!0Q3y z75jjq5jnEjft1-A-1fG{n<1P&-;v!JLbhD;zJJ6*6aGuqA&O6HW@2x2tg2!HOqG;{ zPXdf@rMS!bp2eX)* z1_DVn0RSIlAedAW&`jYcD}#kXBd93~au&EOiowB#Fm32D$YhtPhNT6e+v~Op06G4C zD!wmA2Wlzq4Q81V!6g|8EY$=6yqkgGQcb{gq$iMefE7zXm`PCM7u@dvhAhV6egv6C z>W&gj)CvGO-g+&DUbXOJH7+s(dp9^Ox;??T3-Dr<0*XR!5wEIap%!==`H&*b7p5NM iliItfV(`N_TJRsn-I2qrcQ--+0000h4bkJL zWkC0YdJ4iI@_SW7tAN*lO+bt9`^P}Hg!*EkFVLtI zwg8Wjzn*L}RGU!GAmEtN(+G?qf9L8AEJD@UmG;*#Y!2{2JgvUreQ|zJH@*+ zxx4w8tSWv#M5Yt4UCFf>!>=Y619Ss!_sKcHY*o)%#lIO@5Kj=@0Ao$rEs7VmJ|)6J zRq@minWvOY3vh?}b|JE6xbZ+W@RE{04qRcrtyKJaWQ5qJlUwhu0A4Csr79j5@cj%V z?ssJ-8~$0q3UbrO0X_l-AY0mpivNZwGfVN75j<@)eQwJ2QhNS1Hl>CefV&I@&Hvk! zL3_#V*LpZ>+6{C8u2j5cV|1P3wT6_}xM7WT#jMbT+(Az`Jn@ zr@2q+#&n~zewH%s&Y{oxgJs%b;xM)I# z?=Z#t!Te6gZeNWd7khzQfPi`Fk(2&%6Kr1!<7JNF*0$4RDYE zYZlNob1x%M1vDt579rbRl;L;cT>$5qx)xf>ImngUbY%DGlC^VjaSvW2n}~MeOZE2= zpbu~!-piCA+D`>vyT3*Jq3co`Fy5435JP@KX*z?7}UdkGRm4ODRN zyQo6ur_K4Dz%{De^D)ZYUlI>ez!0Jx`3Z0AP(%J@ho26R3wBaLmYE@23~&H%urdw% zjqY6JV02nwJkh}4R{s-J|o3+&S1YO9zo)XG+NTCQ=v;HjKo3siF7q z5drdxLX353nvr|PBIh6{!wU$%6m`fQ!85~#2<6)YTpO8E`TT}zomeBciNKh1Z zgw_F9$r@m22^*jl??sHC+K70ckkwfrEbE&EIs*eEzE>exsX+W68Xyi1g?-4X0ZO?8 z*svLSpAd*N8$j1pDI>rEo{SPmvjJuziBPDV5wH|_$(9OiH?NpzLQ+-rz(o}IK&cgZ6cq<2 lkU75ucn4{ScC;fQ{sXkm=&-mAd@cY0002ovPDHLkV1i+?1+@SG diff --git a/gtk/gesture/stretch.png b/gtk/gesture/stretch.png deleted file mode 100644 index c1161cc55534fe43125e4b18a542f52e8ab25c22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmV+r1n>KaP)UK~#90?V8DJ6hRcme~ISec2YrH2$?LRGPp)@Ng(kgBIrd3 zh<8s4`gcTcG3Y@MBE;>aXi!5S2aggYUOX5?OiZGgxCA5Wp{kkcp6;r4rhB?d`h&;x z)VzMY@9U|qdaoODi2Q zAZ-|ENh|53a1@xsOy09Oc}@_`z)Xn$M_^-`1ZqJWe)2znexMUrEv*x{Du46*W)W9g z#ciTRyO}bNsxeAA$#=jmjc*Z{!ap5U%n~iYOp-|_gioiE2lV1RKN}p@W_;n?oa{|1foZJC9Hcm8w5$SVK8Jkq% zIVV7ga&l{cb?6EF0yYC{m9df%udV_#CJ>`RIsPq8hZVrZzXD0M->uhtY3iqwHKDP8 z=i1w<03Vd&9rAMoGt`aH`@%roIcnOoGy#vv{wk(61>#^8 z`d49Ww?wcWQ2=F4CNlv5wji1(Srf`k01(ZSu)cxKmN8heS$77z{E7vK)!nPH9`IdbI40sIA>Ko=Q~g9+;Z0000< KMNUMnLSTXtGs9;9 diff --git a/gtk/gesture/two-finger-swipe-left.png b/gtk/gesture/two-finger-swipe-left.png deleted file mode 100644 index d82bb0e42aae439d1d554fa4545121d6597599b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 936 zcmV;Z16TZsP)OHVa5jy~U zkmAP?b;B#CfCY>DD!?(|Ht-IZqxBp8g-8&@thfctB<&`!J^5?^F-y|>hAp&Mb4Ge_ z9u5L^)bI73B(?^8&G`H?uqBBZk@~M#Wn#hkHbJJG1{$c7UqHO)0M`|9qe;wOsqeXE zKE{-Q3mIZeI6`akUl6mXA1DLez!2hFPx+qlth9YgV%AE1b5>ayQbxF*B}T_4gkX97 z-fVE6ZV3cfCtc5)rIMcta6=D{i2;|S>$EO7qYJoiAjGu&L~Lfjtib8U+fA#vL#_?D>oEC6;E6Q0NrBUi z_euKuf!ovtJAscDiJBN-GQCa5ouRdMIAsT7Tk67qA2eS9R|ZVe+&2`)HsG~FM4zVB zrP#Cxx-j4&1%C7GYz3Yw#Hu(a#nyohON=A869zHf*$6zg5YmI#`K9rXGRA0c^9C^~ zy8VPxx-$|m;V@#K@1mB-&#j@~PdKLwxJNz%08Zl81TfoA6hajkBcA~vezQ-aPwuio z44CaF3S%{J&EmcaX34pV$wl5{r80J>LOO9JhcUTWl{4NZ`4D(rDNOMB3e*U&Qt0q$ zK(LiUg--)=trWh_)_oSiT!k`k5nPI8S9E+*!_9G*&lsn;IPUTt;}jRiUA|-f;i3q- zC`>*nqzJB9q5+`=geDpgT0m%`0igwi#)kpRX%FxpaR!7I5SnN}XaS*#280$6nrJ|1 z0io$M0~+leoo2wB_Kr?6paC2zVqo1NWa!oa-crCnRz@O`mCs+=Cpw$5ClxCI0000< KMNUMnLSTaalaP}D diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c index 6b5bdcad0d..28aab42a8d 100644 --- a/gtk/gtkshortcutsshortcut.c +++ b/gtk/gtkshortcutsshortcut.c @@ -189,36 +189,47 @@ gtk_shortcuts_shortcut_set_subtitle (GtkShortcutsShortcut *self, static void update_icon_from_type (GtkShortcutsShortcut *self) { + GIcon *icon; + if (self->icon_set) return; switch (self->shortcut_type) { case GTK_SHORTCUT_GESTURE_PINCH: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/pinch.png"); + icon = g_themed_icon_new ("gesture-pinch-symbolic"); break; case GTK_SHORTCUT_GESTURE_STRETCH: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/stretch.png"); + icon = g_themed_icon_new ("gesture-stretch-symbolic"); break; case GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/rotate-clockwise.png"); + icon = g_themed_icon_new ("gesture-rotate-clockwise-symbolic"); break; case GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/rotate-anticlockwise.png"); + icon = g_themed_icon_new ("gesture-rotate-anticlockwise-symbolic"); break; case GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/two-finger-swipe-left.png"); + icon = g_themed_icon_new ("gesture-two-finger-swipe-left-symbolic"); break; case GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT: - gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/two-finger-swipe-right.png"); + icon = g_themed_icon_new ("gesture-two-finger-swipe-right-symbolic"); break; default: ; + icon = NULL; + break; + } + + if (icon) + { + gtk_image_set_from_gicon (self->image, icon, GTK_ICON_SIZE_DIALOG); + gtk_image_set_pixel_size (self->image, 64); + g_object_unref (icon); } }