From f7b8b3f6f48782edaa19435bf55536330c3b069d Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Thu, 13 Dec 2007 00:06:31 +0000
Subject: [PATCH] Use Oxygen icons for the text tools. Much better now.

svn path=/trunk/KDE/kdegraphics/okular/; revision=747814
---
 ui/data/CMakeLists.txt       |   2 ++
 ui/data/tool-note-inline.png | Bin 0 -> 1534 bytes
 ui/data/tool-note.png        | Bin 0 -> 2422 bytes
 ui/data/tools.xml            |   8 ++++----
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 ui/data/tool-note-inline.png
 create mode 100644 ui/data/tool-note.png

diff --git a/ui/data/CMakeLists.txt b/ui/data/CMakeLists.txt
index e98301529..7c509abe0 100644
--- a/ui/data/CMakeLists.txt
+++ b/ui/data/CMakeLists.txt
@@ -13,6 +13,8 @@ install(FILES
    tool_line_okular.png
    tool_polygon_okular.png
    tool_ellipse_okular.png
+   tool-note.png
+   tool-note-inline.png
    DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
 # install annotation page images
 install(FILES
diff --git a/ui/data/tool-note-inline.png b/ui/data/tool-note-inline.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3e9da7655578f8360d7f8d23d4005f84e64fd4c
GIT binary patch
literal 1534
zcmV<a1p)erP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00nSKL_t(o!>yOgjwDAFhQI$rWL9_2
zRQF7S1;Q*~0}?Fof`ujaJP6OgE3o8kSh7QA!3q|ZL4y!7gKf2uJu}r+T~%>8EF!Wh
ztH<MMF4>)m$jDUwmvhM|z5o7ummhw({O)QcF(e3y7?ZA-Tl?l!vg@mCPcPk`EV0X_
z?D~ntcdmzVxg3Kmf&!Q!8A!Cl!TZ=Ihfz50js@}J)uTVg=Qra|e*Md5zxwg_w(lTg
zF)A(=V;mM|A&!eUjF%yf=W!U%LL3$`jOQW5b5po5g>z&h*a$WtMUVmgQ~(5o*_wdC
zz1$8TeDJ$p#Qk<N{OqUi{@_PHeEhAnvnn%dFI=FoIJ_JUU?U1=U}x=qKivkT{v5FZ
zD$K^?niG%~wdNb(_d~pTw3pkpQeLtv)#X;@k#-81i%@9}3sr$YE^y&~bX*nCwBT*-
z4%B9ZtKCz9vH{%V@{!vZYlMm!CX-|W6EYz)(1>hAYK}+?&<Glk2AmOT3PD%SG`HDY
zxMv!x0zh0|RK+2LX0an{R!IRAdkDq`Xu}LBwy;c~YBoCo&0{{<?+zp&x49?4iOUPO
zVHg57Aa}41ZUeG2WQ#-0Ihl_w{u){$PNcXWdut&eom58qgZTKuY#3v}0`iKaM#3Uk
zi#HTBy}&E(3Dp5-)7)S<fD7xDFjYVW3V1n;jzf6?o{7ulXdyqdx)EN%B_zWw^f4lf
z?b>2@CieAkSQl!E$X6dH_uQdosCUGtSBe&LXxXXWP(piHLTcG8wJK;6>+{eZ2yaGy
zjfu~ON_={$A;g6#w9;w>I*BPEy9<+g`a1ntsaM_CkvO%WC!!OtmKH6JhJg^!NleM8
z$@(~}5Ic@&)^6V{dLnsj90j}*FPAZf=qSi>&BE}y3#ZrNp8AK#@44^wNMQLm3^o|D
zrv8+G9bCYU$~k}wcYh1`+@s0*0=3|^5YNwtU?G6D#@hmU>Oxz#d&(aMet5=bZMhb_
zX52GTA)+vJ2Rh##+ruaJ5cAL-dMNlT_LKd!_ky~IT8K?mBhVt%OKl<|b>Kdqt9pCQ
z9b@m_n^=L8@Vv*%{z#xz!Q_BC5#tz=rrLR1!kt?0ll9)LrzX7Y@v_BhBFZ9!ID4sP
z1+8Xbf8lifFz~tcwW+TeFNs>Vc)o*DiBqP_`nO%Pet}Po>w%U}L}$5wP@kae@w~&+
z9iBGS4Dqyy_;EWobKs$eyLSPa#k@kzcumx@qvkt2Z>alQJO}LlOVqQxo&P8BlA7{-
zho?1le@o44Bqu%`;^E-#wcDQY+7hnjJAA*!(=B!P5?Mu2{~LiR-p2}=+U(JG&pT?`
z;`=o<-BPwM!BgA6ivNzlA<<4OpAndp=N&cO;pw(3e*xvr!-$HBFIL0uKO*o|z!PZe
zaxL4vCcI4GYka?=Y`?_w8VwKzlq>c5=Zj7JdO$d-iJq12bl}sko7ddBT-i3;)0&!A
z)a?sA-C}*)7zQXirN4i2wvBI6sY5^NpmPTfz|(iVe_W<IpRzsOQnxShvc`t?yTv+z
z{o2wepD*$~0`k|@&q4dzysy{X+iUM|X^ZDxYP*+s*<umb@n?b)3A=3jf8LBaa@+{f
zwxlP1^nY)AL!V{2=VOg`<>U>d4ZdID`xPQHoIxCqJNGIo3s`O9{`qH%8gWm%UBN_g
zryhXkYMIyeWO<r_x88p2a2sS58^m^R+uK)R^~LS5`t)Dp>K`|YS08_Rw*KgE7q7nY
zB<1+gv+Zv_yGcLK+3$5eKkQtO`?$IF1^0rN)WZO^M7*3MJIA7_RO+Ap`gr}@KRmtr
z%b%BtIyh9YY~Ox&%lE&t{rKNHUV!h0wtD~o001I-R9JLVZ)S9NVRB^v0C?IfFE7{2
k%*!rLPAo{(%P&d?05;eLSP)anTmS$707*qoM6N<$g7Vz<>;M1&

literal 0
HcmV?d00001

diff --git a/ui/data/tool-note.png b/ui/data/tool-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..d08f3a95c2fba181082a75ad7f91fbdc644a058f
GIT binary patch
literal 2422
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

literal 0
HcmV?d00001

diff --git a/ui/data/tools.xml b/ui/data/tools.xml
index 823779a31..c6338bb8e 100644
--- a/ui/data/tools.xml
+++ b/ui/data/tools.xml
@@ -17,16 +17,16 @@ Engine/Annotation Types [specific attributes]:
     Geom
 -->
 <annotatingTools>
-    <tool id="1" name="Note" pixmap="tool_note">
+    <tool id="1" name="Note" pixmap="tool-note">
         <tooltip>Text Annotation</tooltip>
-        <engine type="PickPoint" color="#FFFF00" hoverIcon="tool_note">
+        <engine type="PickPoint" color="#FFFF00" hoverIcon="tool-note">
             <annotation type="Text" color="#FFFF00" />
         </engine>
         <shortcut>1</shortcut>
     </tool>
-    <tool id="2" name="Inline Note" pixmap="text">
+    <tool id="2" name="Inline Note" pixmap="tool-note-inline">
         <tooltip>Inline Text Annotation (drag to select a zone)</tooltip>
-        <engine type="PickPoint" color="#FFFF00" hoverIcon="tool_note" block="true">
+        <engine type="PickPoint" color="#FFFF00" hoverIcon="tool-note-inline" block="true">
             <annotation type="FreeText" color="#FFFF00" />
         </engine>
         <shortcut>2</shortcut>