From 04a2ebaeef464d826a6e7bdfa37ab66f792f6991 Mon Sep 17 00:00:00 2001 From: Luca Ferretti Date: Fri, 19 Jan 2007 13:52:45 +0000 Subject: [PATCH] Move Evince icons under new apps directory. 2007-01-19 Luca Ferretti * data/icons/*/apps/evince.*: Move Evince icons under new apps directory. * data/icons/*/actions/*: Add new custom themeable Evince icons: view-page-continuous, view-page-facing, zoom-fit-width, zoom-fit-page. From Andreas Nilsson, at 16 and 22 pixels (plus 24 for compatibility). * configure.ac: Add new directories to AC_CONFIG_FILES. * shell/ev-stock-icons.c: * shell/ev-stock-icons.h: Use new custom themeable icons. svn path=/trunk/; revision=2235 --- ChangeLog | 21 ++ configure.ac | 12 +- data/icons/16x16/Makefile.am | 5 +- data/icons/16x16/actions/Makefile.am | 21 ++ .../16x16/actions/view-page-continuous.png | Bin 0 -> 446 bytes .../16x16/actions/view-page-continuous.xcf | Bin 0 -> 2190 bytes data/icons/16x16/actions/view-page-facing.png | Bin 0 -> 471 bytes data/icons/16x16/actions/view-page-facing.xcf | Bin 0 -> 2158 bytes data/icons/16x16/actions/zoom-fit-page.png | Bin 0 -> 870 bytes data/icons/16x16/actions/zoom-fit-page.svg | 282 ++++++++++++++++++ data/icons/16x16/actions/zoom-fit-width.png | Bin 0 -> 847 bytes data/icons/16x16/actions/zoom-fit-width.svg | 278 +++++++++++++++++ data/icons/16x16/apps/Makefile.am | 14 + data/icons/16x16/{ => apps}/evince.png | Bin data/icons/22x22/Makefile.am | 5 +- data/icons/22x22/actions/Makefile.am | 21 ++ .../22x22/actions/view-page-continious.png | Bin 0 -> 722 bytes .../22x22/actions/view-page-continuous.xcf | Bin 0 -> 4004 bytes data/icons/22x22/actions/view-page-facing.png | Bin 0 -> 483 bytes data/icons/22x22/actions/view-page-facing.xcf | Bin 0 -> 1871 bytes data/icons/22x22/actions/zoom-fit-page.png | Bin 0 -> 1377 bytes data/icons/22x22/actions/zoom-fit-page.svg | 254 ++++++++++++++++ data/icons/22x22/actions/zoom-fit-width.png | Bin 0 -> 1405 bytes data/icons/22x22/actions/zoom-fit-width.svg | 252 ++++++++++++++++ data/icons/22x22/apps/Makefile.am | 14 + data/icons/22x22/{ => apps}/evince.png | Bin data/icons/24x24/Makefile.am | 5 +- data/icons/24x24/actions/Makefile.am | 17 ++ .../24x24/actions/view-page-continuous.png | Bin 0 -> 724 bytes data/icons/24x24/actions/view-page-facing.png | Bin 0 -> 471 bytes data/icons/24x24/actions/zoom-fit-page.png | Bin 0 -> 1438 bytes data/icons/24x24/actions/zoom-fit-width.png | Bin 0 -> 1431 bytes data/icons/24x24/apps/Makefile.am | 14 + data/icons/24x24/{ => apps}/evince.png | Bin data/icons/48x48/Makefile.am | 5 +- data/icons/48x48/apps/Makefile.am | 14 + data/icons/48x48/{ => apps}/evince.png | Bin data/icons/scalable/Makefile.am | 5 +- data/icons/scalable/apps/Makefile.am | 14 + data/icons/scalable/{ => apps}/evince.svg | 0 shell/ev-stock-icons.c | 20 +- shell/ev-stock-icons.h | 10 +- 42 files changed, 1250 insertions(+), 33 deletions(-) create mode 100644 data/icons/16x16/actions/Makefile.am create mode 100644 data/icons/16x16/actions/view-page-continuous.png create mode 100644 data/icons/16x16/actions/view-page-continuous.xcf create mode 100644 data/icons/16x16/actions/view-page-facing.png create mode 100644 data/icons/16x16/actions/view-page-facing.xcf create mode 100644 data/icons/16x16/actions/zoom-fit-page.png create mode 100644 data/icons/16x16/actions/zoom-fit-page.svg create mode 100644 data/icons/16x16/actions/zoom-fit-width.png create mode 100644 data/icons/16x16/actions/zoom-fit-width.svg create mode 100644 data/icons/16x16/apps/Makefile.am rename data/icons/16x16/{ => apps}/evince.png (100%) create mode 100644 data/icons/22x22/actions/Makefile.am create mode 100644 data/icons/22x22/actions/view-page-continious.png create mode 100644 data/icons/22x22/actions/view-page-continuous.xcf create mode 100644 data/icons/22x22/actions/view-page-facing.png create mode 100644 data/icons/22x22/actions/view-page-facing.xcf create mode 100644 data/icons/22x22/actions/zoom-fit-page.png create mode 100644 data/icons/22x22/actions/zoom-fit-page.svg create mode 100644 data/icons/22x22/actions/zoom-fit-width.png create mode 100644 data/icons/22x22/actions/zoom-fit-width.svg create mode 100644 data/icons/22x22/apps/Makefile.am rename data/icons/22x22/{ => apps}/evince.png (100%) create mode 100644 data/icons/24x24/actions/Makefile.am create mode 100644 data/icons/24x24/actions/view-page-continuous.png create mode 100644 data/icons/24x24/actions/view-page-facing.png create mode 100644 data/icons/24x24/actions/zoom-fit-page.png create mode 100644 data/icons/24x24/actions/zoom-fit-width.png create mode 100644 data/icons/24x24/apps/Makefile.am rename data/icons/24x24/{ => apps}/evince.png (100%) create mode 100644 data/icons/48x48/apps/Makefile.am rename data/icons/48x48/{ => apps}/evince.png (100%) create mode 100644 data/icons/scalable/apps/Makefile.am rename data/icons/scalable/{ => apps}/evince.svg (100%) diff --git a/ChangeLog b/ChangeLog index 002c202f..ffed9d44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2007-01-19 Luca Ferretti + + * data/icons/*/apps/evince.*: + + Move Evince icons under new apps directory. + + * data/icons/*/actions/*: + + Add new custom themeable Evince icons: view-page-continuous, + view-page-facing, zoom-fit-width, zoom-fit-page. From Andreas + Nilsson, at 16 and 22 pixels (plus 24 for compatibility). + + * configure.ac: + + Add new directories to AC_CONFIG_FILES. + + * shell/ev-stock-icons.c: + * shell/ev-stock-icons.h: + + Use new custom themeable icons. + 2007-01-18 Carlos Garcia Campos * shell/ev-view.c: (ev_view_expose_event), (draw_one_page): diff --git a/configure.ac b/configure.ac index 3693fd38..8fd84246 100644 --- a/configure.ac +++ b/configure.ac @@ -421,13 +421,21 @@ cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile data/evince.desktop.in +data/Makefile +data/icons/Makefile data/icons/16x16/Makefile +data/icons/16x16/apps/Makefile +data/icons/16x16/actions/Makefile data/icons/22x22/Makefile +data/icons/22x22/apps/Makefile +data/icons/22x22/actions/Makefile data/icons/24x24/Makefile +data/icons/24x24/apps/Makefile +data/icons/24x24/action/Makefile data/icons/48x48/Makefile -data/icons/Makefile +data/icons/48x48/apps/Makefile data/icons/scalable/Makefile -data/Makefile +data/icons/scalable/apps/Makefile help/Makefile libdocument/Makefile Makefile diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index eda65ba8..063f6935 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1,4 +1 @@ -icondir = $(datadir)/icons/hicolor/16x16/apps -icon_DATA = evince.png - -EXTRA_DIST = $(icon_DATA) +SUBDIRS = actions apps diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am new file mode 100644 index 00000000..f63776cf --- /dev/null +++ b/data/icons/16x16/actions/Makefile.am @@ -0,0 +1,21 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 16x16 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + view-page-continuous.png \ + view-page-facing.png \ + zoom-fit-page.png \ + zoom-fit-width.png + +noinst_DATA = \ + view-page-continuous.xcf \ + view-page-facing.xcf \ + zoom-fit-page.svg \ + zoom-fit-width.svg + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/16x16/actions/view-page-continuous.png b/data/icons/16x16/actions/view-page-continuous.png new file mode 100644 index 0000000000000000000000000000000000000000..fc583098c3365c8a70f899b3e809f2ea2dbe25bc GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggC9)3O@vrNWty&^&U(&Nac7a(B z?(N^X^!|HpiQ^HM=S8h;%iQk8yT6h>K<+6&*HL5N{VO>lB2~?<9BU{lba>6QYuR0^ zsD^A!NhZMCE@p#_wG!sW466H{Sxy^QAS{}GI+ZBxvX7fK6rQn7{1YQmQ8;nfV>kqv0|?X`MXD+lREeH?GtSysk=T)KAh|R@X4~yv zKtjDlLR=}85Qp9hN&$%ir$7!!a3GSs{v+W}iIZYH+wbk{vW{X@DH0<+&-cEWw{PCg z_tqJ0Y+RX0rIoZcsxpiL*9d&mAAg-#U4lPN8mQ4S`&2gU{`dyy_TbT+FMaro4TN~fO4rPBqqhy%LELG)HiGMhu` zeYk_)#hc&9Solwm!R*}`z2$*p$<&!lK6f@dtfX?|le8^BKNx*5x;7gYaWTb2U5tsv zx^RCNj(6dmU6>?5&+6+^7)2*?U94t@HZ(E3YdRVpa?RqF$^1e&sT@Fav(Lxgh}8eAqHX zqp$IyNwiF6BAMwWGfgCGn@HB=&42ITwAx@eduJjWJ^kuy%OYaM6paRQRj*(D4Lg_t zKit?5fNMT%nWElT|Ii>>Cex8j_mb&4Ri?|z?*CC~gFr4_=Bmx1Fd|lT(WJVn*XAx^ z2Q%PPVSuYXZ0T-cppk2aiLdOiEsnDwi_sKd{WNhFw*%5%V4e@KwO@bv`9f)Sc4m5d zicgU+HYuy$R~9XORx#POy^b8c#1y3Da)j==pi4}lr<=J@jeNdMDJ^f6QoY7&FRaS5 zTXz?vpl}~nrCfgea0xzC1+P*LmRlsObwglnN7)gdYKU@J!c`x>_2HrqOAhSd8Js#G zDjXCyIF+(3p)PL~s#8kUdVc%ff|P5mYSH1JJX(Se&64YsB3&#|DR5L%mIAoy!?!+M z^kKwgGho?&PmK3$hn#HLGHk%L@;d;G-cv-U-}wUATq7 zQFU2}40Emr@Qu$d`mp4{4%!Wc=u`-yxXxLJ{a=fDt%i9c+P5PV!2fEHiQRYrFLlsz zd^$8GX2`w6|Bj#=KX#`ZD(3B|E#{@VJ;76x#!jl|mG6?1YM$15wI%VN`y20l^N}j@ bBPGP}PKmWhR#F}p`H6gdWL~+pjM@GV#ANl- literal 0 HcmV?d00001 diff --git a/data/icons/16x16/actions/view-page-facing.png b/data/icons/16x16/actions/view-page-facing.png new file mode 100644 index 0000000000000000000000000000000000000000..078b4c9e18702ea5fe22d82559c59d58dc9f46d9 GIT binary patch literal 471 zcmV;|0Vw{7P)WFU8GbZ8({Xk{QrNlj4iWF>9@00BEmL_t(I%f*vBO9Md^ zh0oa;x3F8n5>gq153mg>@^}0ZB3LJ6vnYa%ogh|%l7EpRq%fTz5(!~hNz%KpdoA3! zPcdNOz=dJ>?%~|W0RMgHxZP`l$A&Vt8jW2{r*GRq5JaaZXCG_GJ@0v87*P z{1rsxK}2LSd6L;|CXa)Axwv%M>vz;zpx5t6{>1#i@H`K`@8jk58352~wo$L|M5bv< z-tK%pM~)9PNiz?&nr#3G0Wec92{Q8p9oGc_7>$QmES6ZUR;3Ly3?m~j8V{*SLPT(| zcLb6++y^Yn!tLEnvE#9WG_OfQDTP|C_N{JNR{6+cffWDcfMmhmk8{uRi9kAjOHPN* zt8TP?317_Eq>MDKE0xN|8MbW~1su2gUIr_r{p7BE$L&_jR^!jV@e`GMc^aJu#CQMz N002ovPDHLkV1oJbzJLG# literal 0 HcmV?d00001 diff --git a/data/icons/16x16/actions/view-page-facing.xcf b/data/icons/16x16/actions/view-page-facing.xcf new file mode 100644 index 0000000000000000000000000000000000000000..cfe5f23270678535f231a529952bf31d63fd247a GIT binary patch literal 2158 zcmcgt&2H3I7`>jDW(Y~4DzL>8suUKf$buc}f-b5`1tETfDv;1*;&H4dGiYWI$%>Uz zkEe-P0YW^17b8Cd4}b(}o?zN!62g!)l`3#Ex942@I*v#rx@fQTeLm;h`+fHDy`FL0 zxqH@pxnfn^SzBP7NQ3wbgkd0ki6~xrBm@KFB*H`#5vNnkb*HfYI<8|5+D?>fb8~jJ z2`)H!`rEo)YTDD*1GhP2-I%eh@4ml$m9r<*a(Axe*b`3Oou-Bgqd4AZF3j4NTW#9) zhFxyDwQA$s$auvm*Jf*VYg}C>>dsWjI{)=~H4Xri>C`!tP90FH=dHs5OXnN+N@cg| zSd;o*5El*-Q*GjY)otS8%QH5gdcIbvH0);ffUN#lN|gPjd>`pBUI;PtQi$OvTESKC z8Q=2g75jnpLutXTpPl5A0u#n(2yWR!1hyM@w7cr8<$8vZyhsSdGI52zZF$}=I z9QugxzUe5`Q=p$0YYU6}wZdcaGh)yZqhhxsnY*hhuc_Qq`a1K<26O)n^VTNww#qw6 zR<+WHKJdlo?Ahj;=#ZY#r}qrlGe~+avS)Zm&+yZGdhF>XJ!4=)j{U0`NYrBJcgwvU z$<6|2^a+r_|K|x9;?0v`sviSj{ggNXrk_rxn)#IcjCkJ)e(5axIHdiy-y)Inb(f0p zWkGJd?ymMaT?pjA5w9VPuGgXPJ4vtC={)mQ!5Z;;@7I-;RmFS68=G(YeVh=iUnhR^ z_TAQ2%857oTibsme1mxN-S*Co=D_5C=D0Lvth$-kT$DUS}r%U^4Q z-S~t2>JBW#2F@&Mc1ySAko+4zp(HmQWJ4SQs%Uh}&QPZPm}$2&?M|lM&CpcVZ~7u` z6ZeGZ;W}{kf5`kAj$JC1e{$-z`_*aEgT7?y|MhRV{x89;ir?^t82U@b8!KK*B&`*v K$R8R)>i7qYap8vm literal 0 HcmV?d00001 diff --git a/data/icons/16x16/actions/zoom-fit-page.png b/data/icons/16x16/actions/zoom-fit-page.png new file mode 100644 index 0000000000000000000000000000000000000000..05a6186ec2793885f57430657142b88953b2402d GIT binary patch literal 870 zcmV-s1DX7ZP);d2g;5_fRIEKF>%mK~Lrdj|k>+PEYMXO6CUx@MmV8tTckk{KE?S1_+hnY`Z zx^SiKAE4RUR4dD-+XoLF4yvTje)h&MugWn206zN_Y+qxE7%@BY=+RxPq9{kNUcR10 z#PkJ*EM{)6uWtx_8;j?6ct+BTmS>`-#DaWl1}10Xc>ZqGXv&bxRkre#`b8fS55eO9)QJkeMmxY8q9XbDR|bKu<(qP9UOc5Cs8aQ!&iMD1~4!1G8EJ zimHJUjNf;Dzn-3mJfZMZt|;&-@9-2j!SgE62?F98LDcDBH5(8PPxy(*f9qxo1AtD` z$lc%Xj#d_!6j1;+uePAMt~3eUs4GQvkp+5DhqWuDi05r@l!)A^J#cn+xpIsNHMp&0 zvDP;@4%a|133LsN!s830x=@BP?oV^MTuX__Id728oIPD@Hk)oAZ#WrbQL?`9PM8XE z%n$(hf(oh& + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nillson + + + Zoom + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/16x16/actions/zoom-fit-width.png b/data/icons/16x16/actions/zoom-fit-width.png new file mode 100644 index 0000000000000000000000000000000000000000..1c495cab63704a8e9023bad042c01d53d2557d42 GIT binary patch literal 847 zcmV-V1F-ywP){ID#`_-@87y@5$50`IN>Q4jnvlewM&?@_6;!IeL3-tu-?KgQfO*CzFC<3R&jR zs6?0+YeT8YqW@y+S=H3!R6|qK(d!9;&1Or1AouRuw?FiDB$V~q6A(l}K#EoY$~eZS zqKHt2;w(KYNLPAV?5C5WVOr4K+&lpQf{bXx%F=T8XfS4Y^*JEqE!1IXd6XNg$HI$c?yCKL8@d*S<*;aFrCEL;SU7Np1hqVQ15D0!PcJpP|v$D#4+qiSGltIoaa5Z1Ke{?QKG7I` zo>)N=LUzZacC$f8#wzksn9CDDda4E*l?07SLVBtOE>8ffa57pamupMqx>b|eX&OlsMTJrlp;8D~pp#IVsSYJ$np|i-rx^J1HEF>6wR+xs zgL`yj$dh>Gy1KnqK~mT^ZrIpYR9tFIQY(!BFcXUSx}9CV2M_Kq_YRLLswy{$Q8|js zS8q&*XTntp0RUL7)+{2hMh>!>bDqID2j}vjEaR>$@-rVlcpW>dw`IO~;lzrPLbSEr z_WmXKlluC46#%rfv_#@Plf|+|tybULU9%%O5{cki+pXY#1^>fjv8>i=k}t(#G$qE_ Zo}bAxP};H3E++s0002ovPDHLkV1gGrfW!a* literal 0 HcmV?d00001 diff --git a/data/icons/16x16/actions/zoom-fit-width.svg b/data/icons/16x16/actions/zoom-fit-width.svg new file mode 100644 index 00000000..86dcf876 --- /dev/null +++ b/data/icons/16x16/actions/zoom-fit-width.svg @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nillson + + + Zoom + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am new file mode 100644 index 00000000..875cb2ac --- /dev/null +++ b/data/icons/16x16/apps/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(datadir)/icons/hicolor +size = 16x16 +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + evince.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/16x16/evince.png b/data/icons/16x16/apps/evince.png similarity index 100% rename from data/icons/16x16/evince.png rename to data/icons/16x16/apps/evince.png diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index 78fbd7ef..063f6935 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1,4 +1 @@ -icondir = $(datadir)/icons/hicolor/22x22/apps -icon_DATA = evince.png - -EXTRA_DIST = $(icon_DATA) +SUBDIRS = actions apps diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am new file mode 100644 index 00000000..d2b21b2e --- /dev/null +++ b/data/icons/22x22/actions/Makefile.am @@ -0,0 +1,21 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 22x22 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + view-page-continuous.png \ + view-page-facing.png \ + zoom-fit-page.png \ + zoom-fit-width.png + +noinst_DATA = \ + view-page-continuous.xcf \ + view-page-facing.xcf \ + zoom-fit-page.svg \ + zoom-fit-width.svg + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/22x22/actions/view-page-continious.png b/data/icons/22x22/actions/view-page-continious.png new file mode 100644 index 0000000000000000000000000000000000000000..7f74603b40d344005bdf9a6b4ffec019e9ff22d3 GIT binary patch literal 722 zcmV;@0xkWCP)O#A+%q%xIWKq4J=Xx-zB_&C z>XnJ5jg8^};5v@etEv_VR5bvqfCU6_sL4TfP@#}c?_GKHcs6zY+Kr{~9d39(Zmqox zyaiN53{7cdY$CByFvgfe*4jznBhUf92xNf6bV?(@C>Uc*J?;YrfvI-ziSRza?$t8a ztz{0asqC6+Ol#~$gRZVxC=y_+7LlDLN+dd;xvg0ZsNxuh?w)Q`6xI4AfTBtxu8-r? z0#;F!+5}WlS^?SsN57Hn!ESdC|4J@^t=ieA&z?;D4aipQEdN6W;Lg42NnmDIPAfKh zbL!UTt=4#E?ED2h&m);k#sYlbZ*00k;U_^5kk99N{pQuD@$s>f3kxro!(P(*^E}TZ z2m*@5VzWxLS#F?V)hLUL?-?FGOD>mVZEX$UODdH-Ha9oFN~1%CiaJ#kQ9)FiH7kOk zhzO-piA1<7Mn^~SjvOU-Ci`v6a%;G(4M6I(8@djiZl#fH3rpcT3L?W62e#U`c0H=X>s%nfe z8a;wy61AT$=YS7!;APi!pZh)o#+W}oOkLNV2U1b+FX1?IOn(P8dH?_b07*qoM6N<$ Eg2v!HOaK4? literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/view-page-continuous.xcf b/data/icons/22x22/actions/view-page-continuous.xcf new file mode 100644 index 0000000000000000000000000000000000000000..cf3ee51609f730d8a260c9eab4e701f54ac465e2 GIT binary patch literal 4004 zcmds4TWB0r7@pa*cC+0iEne#5f+DGsnhHvNl2rO)t5hh0zDT;=tgC4fHYqk{O9`7} zW=9l3OSLx<`yz!F5h@lG#5ZjzwAtpiyV=cUW^YNlleW3+&W_)IW+vS>+czuH183*_ z-}%p(lkYp{d=r1*V3+5xx6RWQX!i*yPg#}Pn^8p(KaZn2cOJ_;PZjMaP}iaEMx_DN zro1Qdcoxr1eoWgGIN0jq1AwSsbT)SP^tSsvfsP(uu-oVD33PUJZ*?`c`MsU( zok33{e>4UC`&&KD+g^FO`PCiGRT|s3HS@9+L-$u1YWI5{+@PU{ySrMwfeycCd$T>E ztFgBlXkkrv-Qk_&Dz+@%q`W<7P;aFZ# zr>{tRgc?DY?kqSKG_7#+=KS1+jPbMd&JOIFm}D$0aBzM$fA*$v>zs6My&wS93I$}& z&gM@_HBya`mkdgqo14w&a+iM%51f`h#CX7zMrbxOeErX#E=WPZ`k$~{0u>HP)#LME(*_93k#XFDyj?0%=Gls>-|;meEyVNBSR6H6d~?&x$Na%!r{|0y&W(~JUg4qLXm4w zMD7BtM@&T`M|fZ=68RKCF=8tcp+Eb+uoNj|R0jmH^hg$DPL8Z)OzNjeB``0a!r;8D zSt@}d=n>asA_uUlSR5la7P|{`;yIh~*qA1NYi1M5r{x^0@;4k-2_@n=I-<(QO_)-X zkc0FX0elQ_StdPXFEyE5FP9nDgVnKeKk31^9*fIMOE@8HH=Ph>3j+4eJ^>6OU-^(Pcm!~bfL{~8|7vw(qQN>IB@T7GRn{4vDv6uQ;Sh$ zC^{q#6{C1WYofXmMdo7oV(3VyuP@Xm_BleuzR;zx@bsFo)#fXoFzSu+39JLfzFp~d zcfaNP*t4g#*B5+dJM}$m7oc}kbAesdVHW4xR>NK=T)^qO7jqt>_^5bQSQ^ZwQgnnK zOO=wjL2%B|h=s0CiAg;dv0;`?BgD(U|iNy$R_Ko*a}5#1%h;V zuq(BaOsRw9q7-s}UK>bi(w!`++$NVL6_duto#Ox=J%faA&U3bN*|Z7`e!C*mZ44Mb zYzm_&S$uiOWSWbBNdx*=5oeaC!M5d#mI&sj%A^G^Ri3<3jvK8G-!)Z;kabc>Dn!UI z?+s*A1#XVZGN}+7bB>iBMO%bhnx2|T!{#POE?wpZ2^il!*=#zE&xolsJ|MVN0;Vl* zeiy=`5}M_OMg>Zrg&bb0yyr?;j_EL4S7IfeP`F)E$c>o1^Zp>_j=_`35SL+b$@u87 zbJzmldH<~yR@zy$i`pR+!w#7Xyt5`?FSm9 zYtBCU4o6aH`glSFe>yY=mVn$X?QMM)?Xw|>Kb3E5b~*AyQWr{}Di$J6)+W&2Dd literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/view-page-facing.png b/data/icons/22x22/actions/view-page-facing.png new file mode 100644 index 0000000000000000000000000000000000000000..8158ae31f696ec58ea3fd0bae7bbade06013fb70 GIT binary patch literal 483 zcmV<90UZ8`P)WFU8GbZ8({Xk{QrNlj4iWF>9@00BoyL_t(I%k7gtOT$1I z#(#GgGq{~nYA0*)54e^N{b0sm=1OhxGYH~$aS#_f2_orGLZI#7AQ-*G!CGunlUp2w zK5*Rfdmo$&E&1k1!l=CP|X|UhoF6f_0>l%-HQD zNj`ipcmZ&XF*~OxX8;0_0E58;T5kcohT%|ldmZI_fhl1pVK`LXUdQ#lAd%nEN23u@ z6cNWUPtT74w3=<|_1)BU-Rx(Z1*~yhHwAF!GZ6wIL~d5CW*flFQrfWZfS4OgDHq_o z`&-823DfB`XJEtT5@%V);r=l~2#yXwYt8k|)#8g=usLI;6t!Ayo=9t*UnL9HSyiyy z>dHMWVRMO>PmyU6>l7s^{appDEGxAB!oMZ1R4UdcHmswRiZA--)gnkKC;qza*|q+$ ZJ^^Nvggm!wurvSw002ovPDHLkV1id;!d3tP literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/view-page-facing.xcf b/data/icons/22x22/actions/view-page-facing.xcf new file mode 100644 index 0000000000000000000000000000000000000000..1a4942c801172c1d5f2b92e10c8ef3ba27306b07 GIT binary patch literal 1871 zcmcJPO-~a+7{_N9vMnIK%hf%?p#-7{p5b6Tn3!ndxh&i5M%r!KC6<#WW^ub~35f?2 zWBdR;H2nmA2aOy#6=6YMijY90?f5*ivvfApBa_U|Z+^4$(tq1A%v?b&YZ*0TF6soz z7_Z2;ph^-v?m$h>t`UM2%3Y{~P|@QAWPI-)G|!JTeUa7G$4{O4npDx4PpeatQ>^rXX+AUoQ|J3kjmFjg15PcM3Te&E8|rkl7s%y)lDpJW-n8NH zT2{wXm#s{uq}vw<#MzfsXyQ{b4_>5igec{x2W|9yVf>?ow4HtQaAsz*kT>uh86Qv- zsQ4XGs7cN^VTdy{WLV%4fv*WXD)0?pTq`OG0Nevh^!teVpk#}U^bQPT^1HZ`KVttS z34FIw@jld7T|xwOsZ7s)G*KgNM7X&X)SIBe3ixXqtkgWMgXa8}e8t{&5Y+3RU0g-L zU?=#wzP^Q4z@6Q_{euIFR>a@?hpkp1t!mBZTo;$X*x>dPE2&L`b921O_W0gweoY8lX8tFxZ1M z8jUX=t|A~$1Fe8O4YVSLX)xPEo(9?&vNS>)#}j&CLxe=ou%_xMUb_kbC|1Et8rHau;k*YfHks0Xo7ZR_8cTMNxN6^=#T(64Or6+;B-);n+thlHm$ufiq=wo0lWR~EA&@= fUq$yNY?Zi=8$yYWIRNfKs3Mn`!~Pp-lScI)o#GCn literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/zoom-fit-page.png b/data/icons/22x22/actions/zoom-fit-page.png new file mode 100644 index 0000000000000000000000000000000000000000..a074b422b4a8c78eb9c9e13a5c66c1127632ef41 GIT binary patch literal 1377 zcmV-n1)lneP);jc*v;KYgBI>LT`cz*V~@6Mg+CXT>P)g#Sr=A)yZ z&diASp7nL|)QM38Gc&bXuUF6F?9a!K9k2dh_~fY*BO>Olfx*$vojd!3>vMG~ z%WWR4S_J6I1Qa_0_HN5_`}RzH^TP|v-rE<)j~&1GKjD+7PLxE<-REEYX|d@7rteir z2Zqj!p&40}KsGe2LVJKHZ`;Jg+n0t9jePcK z$D*F=>mSNopR17xHJQ+`+O{YKM~1gxw8Ch`E5lpR3Zk|pWi%pI=&9biMgB2_7vFC-BtcMUFoEIGc-U z0AAStEuP*{#sgXjcu!A0q*7UQB=Px;F#hbFn^V#5tz8(caNg5fNOS9pIVFp8c{(I#3ikL#FOj zc&w17+HCWessFI8w*%)PiXDU7OU&MxY0rIn`;GBeU;E8BbPPEAi|f-D>&7)1+1*Xz zA-0}xmoofua-Kg;&a*kH!V@F=zu^xW-5!$bG@aMhz z50>`~>D{2SBO}&YH$DAP#aesd%Vm*OaX|L*MUjhLihkatSO z(&mGQ4hHplJ(;}xkLnsO-g{p9*-J)Q73hS(i3E5Th=>8!mPSx`Jdk+7;;=p;C))qD zR4Q&daPUCTXf%?w&J{o^PDEKHPDGUVA|e7PylBK5Aizri1b`NgMxjLesulNqrBYp( zygV7_b2&Zq^k6v*!{4osB85&2V7$YKh!#Y9yaL1v9)}kp@!lt*u-+@14x|{h-FwAS zanrz_{^0$Ke{akB&-CcgqbiCj+BvO3wD+RD@=BbD6Y-)Fhc$^a&MB)bkeoSl#*H0$ jc@ywk5&5Ck`d9x2U5`;UE2I%Q00000NkvXXu0mjf+u^0P literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/zoom-fit-page.svg b/data/icons/22x22/actions/zoom-fit-page.svg new file mode 100644 index 00000000..0ac072a1 --- /dev/null +++ b/data/icons/22x22/actions/zoom-fit-page.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/22x22/actions/zoom-fit-width.png b/data/icons/22x22/actions/zoom-fit-width.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fe77fd6c81a289fcd0dc12187cd6b076b06793 GIT binary patch literal 1405 zcmV-@1%mpCP)Xy{=}c{d9UX@YFTIqB!;CuP1v3mcI^N=)qgA|6oN++Jj3NPnv;=|*O&e;dq?mlW z*(}-J@6UO?SlTH`9p9OA`Tou`&-0uks>;eae&X1E#C%bVe^52q3LxU$P#2G*?%dds zqkmbov|{Ar;NvHb6~y=_^WBA)`UiI9N~Mw%y7LGSR;tV|%P_<0p=di1mLvI5g6+Y4a9;>h2*$BJUTnJ<0$8-=Ku0~z@V7fTaGV|9EC%-`N^xvO#O9R!>M0M*qOh9AaKvWrZ03V5z4hi}i%|j3ul^I8|QV(}w_8XF{&N6{1cV z-O~pOm0CnDV_9w{lzK`c#y_|c?5Rt(7Q4Gxp8WtZLN2hpHnJ8Y!VeBTx5~Rid)M;% zU;jl|i!msL^}VQTb$x{uI8Yjiqp}pSbA1sb@=1BLLNUUQ&lGr2X;6<+1ZXiF6( z3zh0fSDVig@S7|5cx87V8=mUmd%u|GqdOFS_}Ug`=4zb2`fqyj0r{LqSg9gnr&cLe zmyCxC^X`d!7DQOno#ph^_nEn0Lj<<1E3kcC0b^n2ehd1kVjEVVw=+u^&O3F<_-ZTE zow;-CO7pq3o%q%u2v7I4arXLLtH)OGtk9nEI5+hHYfEjYQ3B7h>6s30PhV-G?#wF7 z&iy+4hg-)Q{Y=FRK-?CgUYfoCXmWO%YWi)RGS7<%&=I&vPVQ=-^0w4um5cWy=R z&fYmS_MPwkWVK>IUGnXllNS~}x6H^uFHT!eI7!{3z(7@r;uI7<-(Nza8k3jDgIhOm z42*v5mGvvZAOD1gjOYLEb369-3=VD!-d$)=U5;38q!=r7WGwl1pJxhLrf*I~*DjCy z?QJ=Ulh{pOdm~JeWcXLF|9WN>_z}EKtpDSDXa4IOw+#8Eo|4zyl}DYUQmwMEFrWNm z`i;1{So!7D^*8(S`Of`&_wDhk)g?D^@zP`PkHDj&qh70isn@^pv)g??*zft75ka>p zh$`3Ps6NqXG%n80-n{`*06kkM7M>m+9`4JUhUK}76PIGown?GXA+YD>8Vqv+^dJax(4{Eh`eB}{n38`6ueIRqa%h~00000 LNkvXXu0mjf=%=x7 literal 0 HcmV?d00001 diff --git a/data/icons/22x22/actions/zoom-fit-width.svg b/data/icons/22x22/actions/zoom-fit-width.svg new file mode 100644 index 00000000..d1498db5 --- /dev/null +++ b/data/icons/22x22/actions/zoom-fit-width.svg @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am new file mode 100644 index 00000000..816fdd0d --- /dev/null +++ b/data/icons/22x22/apps/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(datadir)/icons/hicolor +size = 22x22 +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + evince.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/22x22/evince.png b/data/icons/22x22/apps/evince.png similarity index 100% rename from data/icons/22x22/evince.png rename to data/icons/22x22/apps/evince.png diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index f7daf3e9..063f6935 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1,4 +1 @@ -icondir = $(datadir)/icons/hicolor/24x24/apps -icon_DATA = evince.png - -EXTRA_DIST = $(icon_DATA) +SUBDIRS = actions apps diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am new file mode 100644 index 00000000..e40425c6 --- /dev/null +++ b/data/icons/24x24/actions/Makefile.am @@ -0,0 +1,17 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 24x24 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + view-page-continuous.png \ + view-page-facing.png \ + zoom-fit-page.png \ + zoom-fit-width.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/24x24/actions/view-page-continuous.png b/data/icons/24x24/actions/view-page-continuous.png new file mode 100644 index 0000000000000000000000000000000000000000..00b411ca44a56a570aa5be8e158bf099e02def7f GIT binary patch literal 724 zcmV;_0xSKAP)wJ&3LS0}4S* z4^7&9yq)pT&1TblG`97@vNN;$<~K8M-h1$$hp7tpA5LGpd1GR6V794%s?|pTMU_CW%B@BNKt)luCZdW`???kc z_#f#U;CA=ydJWnFY{h0?zIrjS7iYF&Gy57{CnIRA2al#Fftg)JUb3mXQ}@2NEfFv? zcKHg)WRhq!+SF0GT&B8-bGbD<&m)`7^8UlSZ{y=*XXoeNEC>UWv4u<)7T;ftixX;xQP0e-|{(NnXtb1Pw=PFM*?t|+2{sMLC11VIrI3WWj@ ze|L?Jj*>ialJtetuXZJ>k9tc0srJ5~g`df0vB;CBk9S-jr>S#QRQ!m8478?;kQy2y zbuLAvWU(d7;Y0mR0Zn$YG(@aWJ2L!l@pzm_kITq`5pua4BFgVS+13D6SYKbKSlZk% zZGgVM1OP|+j{?x!n_zimsci;73x#~5TrTF=cB#;K*)$x?BANi!+5z4G=YdbEYK$=& zf;0mL$@}^x;7dEelIyy!%Vh?PG5>t&yRJJ2#5$_)evZFzPjgK9YY!^`0000Arc@Kh(s#6)o2{x`@`)hielICK31@nRFZFYH;ST9*YV!c01Lnv zvv+=Wkp@bD!Qct4cL3gfe<-`Xj&dE(6tENDAF6JzW4n$QkpihkqY*(65QZTyug?Iq znr-U!{n)ncq$F!>+m160=6eZ&5MpV^R5@@d zHn%~NBpe@}B81@N2(;GR-revUHa9>iMXgqw|Do1;`T3P(tyPDM6XdB3o7-UVTW4Ox zTI-IbloY9mEp#ZFsff)qs8lMY&C0SCfKn>F>R(pZfl687PuYz&`Wt-#;dq2RmsULg z0000cdQ@0+LvL+uWo~o;0C?JSE=o--Nlj5G&n(GM2+2rQaQE~L002_w2P2TnWpDrh N002ovPDHLkV1meQ!h8S# literal 0 HcmV?d00001 diff --git a/data/icons/24x24/actions/zoom-fit-page.png b/data/icons/24x24/actions/zoom-fit-page.png new file mode 100644 index 0000000000000000000000000000000000000000..2bfd8b9542c0741b702cf28078967c78f699dc3a GIT binary patch literal 1438 zcmV;P1!4M$P)6HyezrK(T_RpC&nN3KLhIa{)PKtfz|tRPi{pnyam zD1ny7rmmZRwjm@jGKpGOjrWh&>wVvS=Y59*CL|>;2&vEMm1Z=bd1mJK!e?Bv-N4lJ zcnQwU05>mNFl>*?;1QZYb)O0CY? z+I@FxajsRbSI?8$*CtM#uKv%!)b!+-hhRdV zJK*Nc#dzVpw>F%!FHW2~{q}zarlu#$BIfpq7r$LV^KHL%HiKHFCZt=NnpWi&F5d z(VZBrF#4a6RuHu<8KcP<#a}*X&_8r2ho~2}2b4M9-Q6pVmL;Dth``77h|MtN^*^kz zT8jXQ|m-M=1-y*AG6$;l15BKq~>~=nZ@-mHR14 zeCbni;LhJ#n2Yx9>cVJ6>KuK=EK7Im#5N`4X#h4_mZf_&`hqMe4&PG@?C9d=jkyTi z`Nsho;CB};-Wz*<^ciikgM)i^>E(}_WIaW((`W8hg(r$xs?9dPn){I5eI29@qBvz_ zPnqRgi|v)a-8?t(z3>0%)03Rq?_QsOyKd4ZWBYnY9K_b~xpI!5&EDhZv-jBDn-BW^ zno>}}AyjKMDr@)cpBLxjTCMuV)hkza20_>O`1qJttJTw)%d`K1JOZ3NdC~wzBr*N{ zg9nUJ$4tf_ML2+S;)JU<3NOb|{KwnN%Qs?@qCtLJE|qs2{qj+-Uau#!Gk>Z+j648d z`p!#6S>@>jFBS1{sV5?4D=P-j2nvS-5+_(vtV<|}cE2u{OHUp-dcg>#H925%r(BYA8-}is~ z$SXQ~_7^eGmQ<`$E=FA2ITslyQ;e9^|!*KZS-|z0wTK{0-#^Oaj>-qY4x##@=001I-R9JLVZ)S9NVRB^v s0C?IfFE7{2%*!rLPAo{(%P&d?05;eLSP)anTmS$707*qoM6N<$f;I8R0ssI2 literal 0 HcmV?d00001 diff --git a/data/icons/24x24/actions/zoom-fit-width.png b/data/icons/24x24/actions/zoom-fit-width.png new file mode 100644 index 0000000000000000000000000000000000000000..087b4a672f747c05e94180eba4b089144c418a2c GIT binary patch literal 1431 zcmV;I1!($-P)F1syqg{n%GELmPus=8%aHAE;|r-hi9kfb=so*9qFo|*6Go-Rz?reV~oQqK1NJokOic`tmyCCwJb#z%(` z^9?cH3DsynfQWlXZ8(A2%Oj`H{OSJ!jE#?G#dv2k9og4<3NNMd`MhL1G6+yCS6E(I z*7xUc)heapMYZ7%M^2w9{m+20@zFtXyx;Zp52p9*?e(S~tWvIqtkyyR+EXqatseVd z=-}?(X2Y4OD^-odZ;hNjbLGDR#>Pi;;?#PlfbuL}_bxGrB*U0HJ#is$x7Rh*L`}&WkYjJ|V+$-@+dx~eZQkEg|WXPYT7PhNjKlg*th6!v*jAC%aZOOo^rjVPwP9&T+e zuLm^3n1pBOYELrvQH4Ew3tlFhJ2^H!dc3&;F|YO%4yEoqD3kOZlDWqsbkwY_veQct04v@yR!?mn^|dM5f+qsWGSx&9NL+~NYf1B7~#dQWO-b!Qw!qF zQ50-b1tQM$O1U!F-r}(a{PxDjeCJ3vyPiw)(>G_?Vk!Lmjb0X(s$97FcRDjZnUqVh zTtUQ{ZmK|SG*Mhxw$EgeAi|eAl3cj?2@8*^h`@mzSq|>VVjNg_w0ZfLb1gUmU2RE< z#bv8DnrLp3+Kcz*ZZ!67Z^Ls8g0QW#g-f@WHgn(zt|PQ2TrN+4%JzH%PGKH<;J+$jv7`u5JJ0six|>o>0V`>(xtth2B0fdAo2oytbQMm@$jLOS7)Y4vzM zn`CxoI=FRx!fS0wNf?E8>ejo(D2fKozxDP)Q@|5Qi#XmdGi{mg?e6XO@|}6NqdkLK zOSw{EWo0?~>+HK>Wwrd)^zHY$GnuxbW3L?bDwQ=mdG*@oAfEvY4-dP5D-ydsyT5wS z^ZX&#OAHEnKtWWw9R{_@dcA&iaq+<&kSyq>Y%aTPU|_(juC2wBlh;cB4%q^{{)5+D z6B*Bm@vMl4T2DmWCs}a;2f?5y5UUVjiA2Z%f5_#s&m9>!;;mP!@zsARxxdxqL>P;S zj93vdsv;r+7*rfYUBE-d13bVH#lc`ywFJCYES8q8U%MW*wY52i55Lsu`~Gh}Gezgl zT?m0dtVC)wL^M#<2BI}lvkt6*R#d2{vH{ev+7Lsa$Rkw0UM!ZDu1;PHUC%L56dl;g z!9Qz$e%{W{&xeN(y&P)19tsi&1SkQ<1ftqdq%MxF5o=9dQ`kFRIo-(d>q{}0000YdQ@0+Q*UN;cVTj6004N}D=#nC l%goCzPEIUH)ypqR2LLwM23QbN%3J^d002ovPDHLkV1lz%vp4_% literal 0 HcmV?d00001 diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am new file mode 100644 index 00000000..00b9a501 --- /dev/null +++ b/data/icons/24x24/apps/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(datadir)/icons/hicolor +size = 24x24 +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + evince.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/24x24/evince.png b/data/icons/24x24/apps/evince.png similarity index 100% rename from data/icons/24x24/evince.png rename to data/icons/24x24/apps/evince.png diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am index 2b07ee6a..ebbd1452 100644 --- a/data/icons/48x48/Makefile.am +++ b/data/icons/48x48/Makefile.am @@ -1,4 +1 @@ -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = evince.png - -EXTRA_DIST = $(icon_DATA) +SUBDIRS = apps diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am new file mode 100644 index 00000000..32dbf137 --- /dev/null +++ b/data/icons/48x48/apps/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(datadir)/icons/hicolor +size = 48x48 +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + evince.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/48x48/evince.png b/data/icons/48x48/apps/evince.png similarity index 100% rename from data/icons/48x48/evince.png rename to data/icons/48x48/apps/evince.png diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index d7bec5de..ebbd1452 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1,4 +1 @@ -icondir = $(datadir)/icons/hicolor/scalable/apps -icon_DATA = evince.svg - -EXTRA_DIST = $(icon_DATA) +SUBDIRS = apps diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am new file mode 100644 index 00000000..af419947 --- /dev/null +++ b/data/icons/scalable/apps/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(datadir)/icons/hicolor +size = scalable +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + evince.svg + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/scalable/evince.svg b/data/icons/scalable/apps/evince.svg similarity index 100% rename from data/icons/scalable/evince.svg rename to data/icons/scalable/apps/evince.svg diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c index cda5c53c..3b304895 100644 --- a/shell/ev-stock-icons.c +++ b/shell/ev-stock-icons.c @@ -34,13 +34,13 @@ typedef struct { char *icon; } EvStockIcon; -/* Evince stock icons from gnome-icon-theme */ +/* Evince stock icons */ static const EvStockIcon stock_icons [] = { - { EV_STOCK_ZOOM_PAGE, "stock_zoom-page" }, - { EV_STOCK_ZOOM_WIDTH, "stock_zoom-page-width" }, - { EV_STOCK_LEAVE_FULLSCREEN, "stock_leave-fullscreen" }, - { EV_STOCK_VIEW_DUAL, "stock_preview-two-pages" }, - { EV_STOCK_VIEW_CONTINUOUS, "stock_new-master-document" }, + { EV_STOCK_ZOOM_PAGE, "zoom-fit-page" }, + { EV_STOCK_ZOOM_WIDTH, "zoom-fit-width" }, + { EV_STOCK_LEAVE_FULLSCREEN, "view-restore" }, + { EV_STOCK_VIEW_DUAL, "view-page-facing" }, + { EV_STOCK_VIEW_CONTINUOUS, "view-page-continuous" }, { EV_STOCK_ROTATE_LEFT, "object-rotate-left"}, { EV_STOCK_ROTATE_RIGHT, "object-rotate-right"}, }; @@ -73,4 +73,12 @@ ev_stock_icons_init (void) gtk_icon_source_free (source); g_object_unref (G_OBJECT (factory)); + + /* GtkIconTheme will then look in Evince custom hicolor dir + * for icons as well as the standard search paths + */ + /* FIXME: multi-head! */ + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + DATADIR G_DIR_SEPARATOR_S "icons"); + } diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h index 4064ef09..3ea635a9 100644 --- a/shell/ev-stock-icons.h +++ b/shell/ev-stock-icons.h @@ -29,11 +29,11 @@ G_BEGIN_DECLS /* Evince stock icons */ -#define EV_STOCK_ZOOM_PAGE "stock_zoom-page" -#define EV_STOCK_ZOOM_WIDTH "stock_zoom-page-width" -#define EV_STOCK_LEAVE_FULLSCREEN "stock_leave-fullscreen" -#define EV_STOCK_VIEW_DUAL "stock_view-dual-page" -#define EV_STOCK_VIEW_CONTINUOUS "stock_view-continuous" +#define EV_STOCK_ZOOM_PAGE "zoom-fit-page" +#define EV_STOCK_ZOOM_WIDTH "zoom-fit-width" +#define EV_STOCK_LEAVE_FULLSCREEN "view-restore" +#define EV_STOCK_VIEW_DUAL "view-page-facing" +#define EV_STOCK_VIEW_CONTINUOUS "view-page-continuous" #define EV_STOCK_ROTATE_LEFT "object-rotate-left" #define EV_STOCK_ROTATE_RIGHT "object-rotate-right" -- 2.43.0